From 2347acb8731a6884de33d938542722098d1da08f Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Tue, 21 Aug 2018 11:55:58 -0700 Subject: [PATCH] Build Hostx86/arm32 coreclrpal when CROSSCOMPILE is "1" and Hostx64/arm32 coreclrpal otherwise in configurecompiler.cmake --- src/pal/src/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt index baa4a44..fe73050 100644 --- a/src/pal/src/CMakeLists.txt +++ b/src/pal/src/CMakeLists.txt @@ -71,8 +71,13 @@ include_directories(include) if(CLR_CROSS_COMPONENTS_BUILD) if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL amd64) if(CLR_CMAKE_TARGET_ARCH STREQUAL "arm") - set(PAL_CMAKE_PLATFORM_ARCH_I386 1) - add_definitions(-D_X86_) + if($ENV{CROSSCOMPILE} STREQUAL "1") + set(PAL_CMAKE_PLATFORM_ARCH_I386 1) + add_definitions(-D_X86_) + else() + set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1) + add_definitions(-D_AMD64_) + endif() else() set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1) add_definitions(-D_AMD64_) -- 2.7.4