| commit | 1a089be69fdf568c6cf2cab05bd55f97e1f21025 | [log] [tgz] |
|---|---|---|
| author | Adam Langley <agl@imperialviolet.org> | Tue Sep 10 21:07:05 2024 +0000 |
| committer | Adam Langley <agl@google.com> | Tue Sep 10 21:27:21 2024 +0000 |
| tree | bb4902d62d04416484025701d945740d005c3607 | |
| parent | ee26855eda26c29fae4a809eb23b1f8fcffe32cf [diff] |
Don't enable asm if OPENSSL_NO_ASM is set. This fixes the FIPS+OPENSSL_NO_ASM build. Change-Id: Iadbf911711b3d9d86ae03dc67d5c868359170fa2 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/71107 Auto-Submit: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/71127
diff --git a/CMakeLists.txt b/CMakeLists.txt index 26fad80..cb1f64b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -365,7 +365,9 @@ set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -gcv8") else() enable_language(ASM) - set(OPENSSL_ASM TRUE) + if (NOT OPENSSL_NO_ASM) + set(OPENSSL_ASM TRUE) + endif() # Work around https://gitlab.kitware.com/cmake/cmake/-/issues/20771 in older # CMake versions. if(APPLE AND CMAKE_VERSION VERSION_LESS 3.19)