diff options
| author | Brent Cook <busterb@gmail.com> | 2023-05-27 01:21:29 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2023-05-27 01:21:29 -0500 |
| commit | 3ef498f9e63a7a32529c86d5ba7460280b7ff306 (patch) | |
| tree | 93a73e32cecabde431408ecc626175a7398a963e /CMakeLists.txt | |
| parent | e6dbcc47dcf8090a80ea0cd6ad9e867da2450102 (diff) | |
| parent | 419fbd6fba15beaea3f3e6d22ef9e161f032f460 (diff) | |
| download | portable-3.8.0.tar.gz portable-3.8.0.tar.bz2 portable-3.8.0.zip | |
Land #865, fix asm on x86_64 macOSv3.8.0
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e05221c..7847830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -344,7 +344,7 @@ if(ENABLE_ASM) | |||
| 344 | endif() | 344 | endif() |
| 345 | add_definitions(-DHAVE_GNU_STACK) | 345 | add_definitions(-DHAVE_GNU_STACK) |
| 346 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 346 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |
| 347 | set(ENABLE_ASM false) | 347 | set(HOST_ASM_MACOSX_X86_64 true) |
| 348 | elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) | 348 | elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) |
| 349 | set(HOST_ASM_MASM_X86_64 true) | 349 | set(HOST_ASM_MASM_X86_64 true) |
| 350 | ENABLE_LANGUAGE(ASM_MASM) | 350 | ENABLE_LANGUAGE(ASM_MASM) |