Skip to content

Commit d7dd7e2

Browse files
Hopefully correct x86 macOS build.
1 parent 50d6108 commit d7dd7e2

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ message("******************************")
1919

2020
# Is this x86_32?
2121
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86" OR
22+
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86" OR
2223
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_32" OR
24+
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86-32" OR
2325
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR
2426
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i486" OR
2527
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i586" OR
2628
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686" OR
27-
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ia32")
29+
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ia32" OR
30+
"$ENV{ARCH}" STREQUAL "x86")
2831
set(MU_IS_X86_32 YES)
2932
endif()
3033

src/armv5te/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ else()
3636
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
3737
target_sources(MuCoreArmV5TEExperimental PUBLIC
3838
translate_arm.cpp)
39+
elseif(MU_IS_X86_32 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(i386)")
40+
target_sources(MuCoreArmV5TEExperimental PUBLIC
41+
translate_x86.c)
3942
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(x86-64)|(amd64)|(AMD64)")
4043
target_sources(MuCoreArmV5TEExperimental PUBLIC
4144
translate_x86_64.c)
42-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(i386)")
43-
target_sources(MuCoreArmV5TEExperimental PUBLIC
44-
translate_x86.c)
4545
endif()
4646
endif()
4747

0 commit comments

Comments
 (0)