diff --git a/build-tools/mono-runtimes/mono-runtimes.props b/build-tools/mono-runtimes/mono-runtimes.props index d7fa2d4ed2f..cf8af54c463 100644 --- a/build-tools/mono-runtimes/mono-runtimes.props +++ b/build-tools/mono-runtimes/mono-runtimes.props @@ -25,7 +25,7 @@ <_MingwTriplet64>x86_64-w64-mingw32$(_MingwPrefixTail) - <_LlvmNeeded Condition=" '$(AndroidSupportedTargetAotAbis)' != '' ">yes + <_LlvmNeeded Condition=" '$(AndroidBuildCross)' != 'false' And '$(AndroidSupportedTargetAotAbis)' != '' ">yes <_LlvmCanBuild64 Condition=" '$(HostBits)' == '64' ">yes <_LlvmOutputDirTop>$(_CrossOutputDirTop)\llvm diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk index 1ed03423c3c..f68d1a5c36e 100644 --- a/build-tools/scripts/BuildEverything.mk +++ b/build-tools/scripts/BuildEverything.mk @@ -76,7 +76,8 @@ join-with = $(subst $(_space),$(1),$(strip $(2))) _MSBUILD_ARGS = \ /p:AndroidSupportedTargetJitAbis=$(call join-with,:,$(ALL_JIT_ABIS)) \ /p:AndroidSupportedHostJitAbis=$(call join-with,:,$(ALL_HOST_ABIS)) \ - /p:AndroidSupportedTargetAotAbis=$(call join-with,:,$(ALL_AOT_ABIS)) + /p:AndroidSupportedTargetAotAbis=$(call join-with,:,$(ALL_AOT_ABIS)) \ + /p:AndroidBuildCross=$(BUILD_CROSS) CONFIGURATIONS ?= Debug Release