Browse Source

[Minor] Another try to use the proper linker

tags/3.6
Vsevolod Stakhov 10 months ago
parent
commit
cfd83431c0
No account linked to committer's email address
3 changed files with 5 additions and 3 deletions
  1. 1
    0
      CMakeLists.txt
  2. 0
    1
      cmake/Sanitizer.cmake
  3. 4
    2
      cmake/Toolset.cmake

+ 1
- 0
CMakeLists.txt View File

@@ -85,6 +85,7 @@ ENDIF()
FIND_PACKAGE(PkgConfig REQUIRED)
FIND_PACKAGE(Perl REQUIRED)

option (SANITIZE "Enable sanitizer: address, memory, undefined, leak (comma separated list)" "")
INCLUDE(Toolset)
INCLUDE(Sanitizer)


+ 0
- 1
cmake/Sanitizer.cmake View File

@@ -1,6 +1,5 @@
# Ported from Clickhouse: https://github.com/ClickHouse/ClickHouse/blob/master/cmake/sanitize.cmake

option (SANITIZE "Enable sanitizer: address, memory, undefined, leak (comma separated list)" "")
set (SAN_FLAGS "${SAN_FLAGS} -g -fno-omit-frame-pointer -DSANITIZER")
# O1 is normally set by clang, and -Og by gcc
if (COMPILER_GCC)

+ 4
- 2
cmake/Toolset.cmake View File

@@ -80,12 +80,14 @@ if(NOT LINKER_NAME)
if(LLD_PATH)
if (COMPILER_CLANG)
set(LINKER_NAME "lld")
else()
elseif(NOT SANITIZE)
if(GOLD_PATH)
set(LINKER_NAME "gold")
else()
message(STATUS "Use generic 'ld' as a linker")
message(STATUS "Use generic 'ld' as a linker: gold not found")
endif()
else()
message(STATUS "Use generic 'ld' as a linker: sanitizers are enabled")
endif()
elseif(GOLD_PATH)
set(LINKER_NAME "gold")

Loading…
Cancel
Save