From 7a60bac46513722d204ee1755a6fa84b985443f3 Mon Sep 17 00:00:00 2001 From: Justin Smith Date: Wed, 7 Aug 2024 08:42:03 -0400 Subject: [PATCH 1/2] NASM use default debug format --- crypto/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index b4a9154b4d..67406b9900 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -113,7 +113,11 @@ if(NOT OPENSSL_NO_ASM) endif() find_program(NASM_EXECUTABLE nasm) set(CMAKE_ASM_NASM_COMPILER ${NASM_EXECUTABLE}) - set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -gcv8") + if("${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "relwithdebinfo" OR + NOT CMAKE_BUILD_TYPE_LOWER MATCHES "rel") + # Provide debug in the default format + set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -g") + endif() # On Windows, we use the NASM output. set(ASM_EXT asm) From 4d6d6635c95d62a196bf3466c0f92acf49eabb4f Mon Sep 17 00:00:00 2001 From: Justin W Smith <103147162+justsmth@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:13:23 -0400 Subject: [PATCH 2/2] Update crypto/CMakeLists.txt Co-authored-by: dkostic <25055813+dkostic@users.noreply.github.com> --- crypto/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 67406b9900..7a179ce5bf 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -114,7 +114,7 @@ if(NOT OPENSSL_NO_ASM) find_program(NASM_EXECUTABLE nasm) set(CMAKE_ASM_NASM_COMPILER ${NASM_EXECUTABLE}) if("${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "relwithdebinfo" OR - NOT CMAKE_BUILD_TYPE_LOWER MATCHES "rel") + "${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "debug") # Provide debug in the default format set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -g") endif()