From 9ba718cecec669429303b4be106afca1ad9a70c4 Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Fri, 17 Aug 2018 13:52:14 -0700 Subject: [PATCH] Build Hostx86/arm32 crossgen when CROSSCOMPILE is "1" and Hostx64/arm32 crossgen otherwise in configurecompiler.cmake Commit migrated from https://github.com/dotnet/coreclr/commit/1e7a3d97ffba7d5721112fd451a6f4cd41a9b5d2 --- src/coreclr/configurecompiler.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/coreclr/configurecompiler.cmake b/src/coreclr/configurecompiler.cmake index 2d1672b..7ee19ba 100644 --- a/src/coreclr/configurecompiler.cmake +++ b/src/coreclr/configurecompiler.cmake @@ -9,7 +9,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) # CMAKE_HOST_SYSTEM_PROCESSOR returns the value of `uname -p` on host. if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL amd64) if(CLR_CMAKE_TARGET_ARCH STREQUAL "arm") - set(CLR_CMAKE_PLATFORM_UNIX_X86 1) + if($ENV{CROSSCOMPILE} STREQUAL "1") + set(CLR_CMAKE_PLATFORM_UNIX_X86 1) + else() + set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) + endif() else() set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) endif() -- 2.7.4