From c943319e446ec738fd1f35965afeffcbc85af4ec Mon Sep 17 00:00:00 2001 From: Gleb Balykov Date: Thu, 20 Feb 2020 00:19:50 +0300 Subject: [PATCH] Fix armel cross build of native part of libraries (#32127) --- eng/native/configureplatform.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index c1b627f5f9dd7..29f4f85436ba8 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -137,7 +137,7 @@ if(CLR_CMAKE_HOST_UNIX_ARM) set(CLR_CMAKE_HOST_ARCH_ARM 1) set(CLR_CMAKE_HOST_ARCH "arm") - if(CLR_CMAKE_HOST_HOST_ARMV7L) + if(CLR_CMAKE_HOST_UNIX_ARMV7L) set(CLR_CMAKE_HOST_ARCH_ARMV7L 1) endif() elseif(CLR_CMAKE_HOST_UNIX_ARM64) @@ -169,6 +169,12 @@ endif() # if target arch is not specified then host & target are same if(NOT DEFINED CLR_CMAKE_TARGET_ARCH OR CLR_CMAKE_TARGET_ARCH STREQUAL "" ) set(CLR_CMAKE_TARGET_ARCH ${CLR_CMAKE_HOST_ARCH}) + + # This is required for "arm" targets (CMAKE_SYSTEM_PROCESSOR "armv7l"), + # for which this flag otherwise won't be set up below + if (CLR_CMAKE_HOST_ARCH_ARMV7L) + set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1) + endif() endif() # Set target architecture variables @@ -182,6 +188,7 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64) set(CLR_CMAKE_TARGET_ARCH_ARM 1) elseif(CLR_CMAKE_TARGET_ARCH STREQUAL armel) set(CLR_CMAKE_TARGET_ARCH_ARM 1) + set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1) set(ARM_SOFTFP 1) else() clr_unknown_arch()