diff options
| author | Brent Cook <busterb@gmail.com> | 2023-08-13 23:23:23 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2023-08-13 23:23:23 -0500 |
| commit | ca8ea65259f95b424040ff6f905044fb876a2180 (patch) | |
| tree | 61f285c959690124c888764c7d2bd680d8f7f643 | |
| parent | 7e59829f180ae6542c2582334ab5830c15ba3cea (diff) | |
| parent | e0fd031f300570437f1aa768ea6997850a36cd0a (diff) | |
| download | portable-ca8ea65259f95b424040ff6f905044fb876a2180.tar.gz portable-ca8ea65259f95b424040ff6f905044fb876a2180.tar.bz2 portable-ca8ea65259f95b424040ff6f905044fb876a2180.zip | |
Land #894, fix to enable ASM support in MinGW builds
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | crypto/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8027474..991f60c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -371,7 +371,7 @@ if(ENABLE_ASM) | |||
| 371 | elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) | 371 | elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) |
| 372 | set(HOST_ASM_MASM_X86_64 true) | 372 | set(HOST_ASM_MASM_X86_64 true) |
| 373 | ENABLE_LANGUAGE(ASM_MASM) | 373 | ENABLE_LANGUAGE(ASM_MASM) |
| 374 | elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 374 | elseif(MINGW AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |
| 375 | set(HOST_ASM_MINGW64_X86_64 true) | 375 | set(HOST_ASM_MINGW64_X86_64 true) |
| 376 | endif() | 376 | endif() |
| 377 | endif() | 377 | endif() |
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index b425959..1e73e88 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -904,7 +904,7 @@ else() | |||
| 904 | (NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) | 904 | (NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) |
| 905 | add_definitions(-DOPENSSL_NO_ASM) | 905 | add_definitions(-DOPENSSL_NO_ASM) |
| 906 | endif() | 906 | endif() |
| 907 | elseif(WIN32) | 907 | elseif(WIN32 AND NOT MINGW) |
| 908 | add_definitions(-DOPENSSL_NO_ASM) | 908 | add_definitions(-DOPENSSL_NO_ASM) |
| 909 | endif() | 909 | endif() |
| 910 | endif() | 910 | endif() |