Fix location of NASM flags. Previously, builds only worked accidentally because the combination of Release + Prefixing + Windows isn't on CI/CQ. Bug: 42220000 Change-Id: Ifec42f5839d6ea4fcbc1a412d10bb2fc6a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/88447 Auto-Submit: Rudolf Polzer <rpolzer@google.com> Commit-Queue: Xiangfei Ding <xfding@google.com> Reviewed-by: Xiangfei Ding <xfding@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c908a1..30fab11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -65,8 +65,6 @@ # CMake automatically connects include_directories to the NASM # command-line, but not add_definitions. set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -DBORINGSSL_DISPATCH_TEST") - # Also add the generated files to NASM's includes. With a final slash. - set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/gen/") endif() endif() @@ -88,6 +86,9 @@ # CMake automatically connects include_directories to the NASM command-line, # but not add_definitions. set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -DBORINGSSL_PREFIX=${BORINGSSL_PREFIX}") + + # Also add the generated files to NASM's includes. With a final slash for NASM 2. + set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/gen/") endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")