File tree Expand file tree Collapse file tree 3 files changed +5
-2
lines changed Expand file tree Collapse file tree 3 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -298,6 +298,9 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
298298
299299 add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY} )
300300
301+ # persist variables across multiple try_compile passes
302+ list (APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CLR_ARM_FPU_TYPE CLR_ARM_FPU_CAPABILITY)
303+
301304 if (TARGET_ARCH_NAME STREQUAL "armel" )
302305 add_compile_options (-mfloat-abi=softfp)
303306 endif ()
Original file line number Diff line number Diff line change 7878 <BuildArgs Condition =" '$(KeepNativeSymbols)' != 'false'" >$(BuildArgs) -keepnativesymbols</BuildArgs >
7979 <BuildArgs Condition =" '$(CrossBuild)' == 'true'" >$(BuildArgs) -cross</BuildArgs >
8080 <BuildArgs Condition =" '$(Compiler)' != ''" >$(BuildArgs) $(Compiler)</BuildArgs >
81- <BuildArgs Condition =" '$(CMakeArgs)' != ''" >$(BuildArgs) $(CMakeArgs)</BuildArgs >
81+ <BuildArgs Condition =" '$(CMakeArgs)' != ''" >$(BuildArgs) -cmakeargs " $(CMakeArgs)" </BuildArgs >
8282 <BuildArgs Condition =" '$(Ninja)' == 'true'" >$(BuildArgs) -ninja</BuildArgs >
8383 <BuildArgs >$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs >
8484 <BuildArgs Condition =" '$(OfficialBuildId)' != ''" >$(BuildArgs) /p:OfficialBuildId="$(OfficialBuildId)"</BuildArgs >
Original file line number Diff line number Diff line change 2929 <_PortableBuildArg Condition =" '$(PortableBuild)' != 'true'" > -portablebuild=false</_PortableBuildArg >
3030 <_CrossBuildArg Condition =" '$(CrossBuild)' == 'true'" > -cross</_CrossBuildArg >
3131 <_KeepNativeSymbolsBuildArg Condition =" '$(KeepNativeSymbols)' != 'false'" > -keepnativesymbols</_KeepNativeSymbolsBuildArg >
32- <_CMakeArgs Condition =" '$(CMakeArgs)' != ''" > $(CMakeArgs)</_CMakeArgs >
32+ <_CMakeArgs Condition =" '$(CMakeArgs)' != ''" > -cmakeargs " $(CMakeArgs)" </_CMakeArgs >
3333
3434 <!--
3535 BuildNativeCompiler is a pass-through argument, to pass an argument to build-native.sh. It is intended to be
You can’t perform that action at this time.
0 commit comments