Skip to content

Commit 2f6bbd7

Browse files
committed
Fix armel cross build of native part of libraries
1 parent 581c3bf commit 2f6bbd7

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

eng/native/configureplatform.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ if(CLR_CMAKE_HOST_UNIX_ARM)
137137
set(CLR_CMAKE_HOST_ARCH_ARM 1)
138138
set(CLR_CMAKE_HOST_ARCH "arm")
139139

140-
if(CLR_CMAKE_HOST_HOST_ARMV7L)
140+
if(CLR_CMAKE_HOST_UNIX_ARMV7L)
141141
set(CLR_CMAKE_HOST_ARCH_ARMV7L 1)
142142
endif()
143143
elseif(CLR_CMAKE_HOST_UNIX_ARM64)
@@ -169,6 +169,12 @@ endif()
169169
# if target arch is not specified then host & target are same
170170
if(NOT DEFINED CLR_CMAKE_TARGET_ARCH OR CLR_CMAKE_TARGET_ARCH STREQUAL "" )
171171
set(CLR_CMAKE_TARGET_ARCH ${CLR_CMAKE_HOST_ARCH})
172+
173+
# This is required for "arm" targets (CMAKE_SYSTEM_PROCESSOR "armv7l"),
174+
# for which this flag otherwise won't be set up below
175+
if (CLR_CMAKE_HOST_ARCH_ARMV7L)
176+
set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
177+
endif()
172178
endif()
173179

174180
# Set target architecture variables
@@ -182,6 +188,7 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
182188
set(CLR_CMAKE_TARGET_ARCH_ARM 1)
183189
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL armel)
184190
set(CLR_CMAKE_TARGET_ARCH_ARM 1)
191+
set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
185192
set(ARM_SOFTFP 1)
186193
else()
187194
clr_unknown_arch()

0 commit comments

Comments
 (0)