diff options
| author | Brent Cook <busterb@gmail.com> | 2023-11-07 07:47:44 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2023-11-07 07:47:44 -0600 |
| commit | b845c086e2e79cd930f5f9540a7ae174b344a7cc (patch) | |
| tree | d2ad5ee9336bf256ac84a1ed60054c3d72ea38a1 | |
| parent | 7a3d827729751b4321d83bb0b55eba26162b0d31 (diff) | |
| parent | 690b98fe39a05eb193a57ca45dbd72a2142a9fb4 (diff) | |
| download | portable-b845c086e2e79cd930f5f9540a7ae174b344a7cc.tar.gz portable-b845c086e2e79cd930f5f9540a7ae174b344a7cc.tar.bz2 portable-b845c086e2e79cd930f5f9540a7ae174b344a7cc.zip | |
Land #936, fix arm64 builds to not trigger armv4 asm
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ec47fe8..950a79e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -364,7 +364,8 @@ if(ENABLE_ASM) | |||
| 364 | if("${CMAKE_C_COMPILER_ABI}" STREQUAL "ELF") | 364 | if("${CMAKE_C_COMPILER_ABI}" STREQUAL "ELF") |
| 365 | if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)") | 365 | if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)") |
| 366 | set(HOST_ASM_ELF_X86_64 true) | 366 | set(HOST_ASM_ELF_X86_64 true) |
| 367 | elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm") | 367 | elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm" AND |
| 368 | NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64") | ||
| 368 | set(HOST_ASM_ELF_ARMV4 true) | 369 | set(HOST_ASM_ELF_ARMV4 true) |
| 369 | elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386") | 370 | elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386") |
| 370 | set(HOST_ASM_ELF_X86_64 true) | 371 | set(HOST_ASM_ELF_X86_64 true) |