Skip to content

Commit 8eeb9d9

Browse files
committed
llvm-test-suite.cmake.example: fix optimization level selection
The `*_FLAGS_RELEASE` options are added after `*_FLAGS` ones by CMake, resulting in `-O3 -DNDEBUG` being added unconditionally. This commit overrides both set of variables (and passes `FORCE` flag to `set`) to prevent hard-to-spot errors.
1 parent c752b36 commit 8eeb9d9

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

llvm-test-suite.cmake.example

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,17 @@ string(APPEND ldflags " -Wl,--dynamic-linker,/opt/llvm-pauth/aarch64-linux-pauth
2323
# Improves quality of analysis done by BOLT gadget scanner.
2424
string(APPEND ldflags " -Wl,--emit-relocs")
2525

26-
set(CMAKE_C_FLAGS "${allflags} ${cflags}" CACHE STRING "")
27-
set(CMAKE_CXX_FLAGS "${allflags} ${cflags}" CACHE STRING "")
28-
set(CMAKE_EXE_LINKER_FLAGS "${allflags} ${ldflags}" CACHE STRING "")
29-
set(CMAKE_MODULE_LINKER_FLAGS "${allflags} ${ldflags}" CACHE STRING "")
30-
set(CMAKE_SHARED_LINKER_FLAGS "${allflags} ${ldflags}" CACHE STRING "")
26+
set(CMAKE_C_FLAGS "${allflags} ${cflags}" CACHE STRING "" FORCE)
27+
set(CMAKE_CXX_FLAGS "${allflags} ${cflags}" CACHE STRING "" FORCE)
28+
set(CMAKE_EXE_LINKER_FLAGS "${allflags} ${ldflags}" CACHE STRING "" FORCE)
29+
set(CMAKE_MODULE_LINKER_FLAGS "${allflags} ${ldflags}" CACHE STRING "" FORCE)
30+
set(CMAKE_SHARED_LINKER_FLAGS "${allflags} ${ldflags}" CACHE STRING "" FORCE)
31+
32+
# The *_RELEASE options are appended to the command line after the generic ones.
33+
set(CMAKE_C_FLAGS_RELEASE "${allflags} ${cflags}" CACHE STRING "" FORCE)
34+
set(CMAKE_CXX_FLAGS_RELEASE "${allflags} ${cflags}" CACHE STRING "" FORCE)
35+
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${allflags} ${ldflags}" CACHE STRING "" FORCE)
36+
set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${allflags} ${ldflags}" CACHE STRING "" FORCE)
37+
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${allflags} ${ldflags}" CACHE STRING "" FORCE)
3138

3239
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

0 commit comments

Comments
 (0)