File tree 1 file changed +8
-1
lines changed
1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -137,7 +137,7 @@ if(CLR_CMAKE_HOST_UNIX_ARM)
137
137
set (CLR_CMAKE_HOST_ARCH_ARM 1)
138
138
set (CLR_CMAKE_HOST_ARCH "arm" )
139
139
140
- if (CLR_CMAKE_HOST_HOST_ARMV7L )
140
+ if (CLR_CMAKE_HOST_UNIX_ARMV7L )
141
141
set (CLR_CMAKE_HOST_ARCH_ARMV7L 1)
142
142
endif ()
143
143
elseif (CLR_CMAKE_HOST_UNIX_ARM64)
@@ -169,6 +169,12 @@ endif()
169
169
# if target arch is not specified then host & target are same
170
170
if (NOT DEFINED CLR_CMAKE_TARGET_ARCH OR CLR_CMAKE_TARGET_ARCH STREQUAL "" )
171
171
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 ()
172
178
endif ()
173
179
174
180
# Set target architecture variables
@@ -182,6 +188,7 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
182
188
set (CLR_CMAKE_TARGET_ARCH_ARM 1)
183
189
elseif (CLR_CMAKE_TARGET_ARCH STREQUAL armel)
184
190
set (CLR_CMAKE_TARGET_ARCH_ARM 1)
191
+ set (CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
185
192
set (ARM_SOFTFP 1)
186
193
else ()
187
194
clr_unknown_arch()
You can’t perform that action at this time.
0 commit comments