Skip to content

Commit

Permalink
[cmake] Make check_linker_flags operate via linker flags
Browse files Browse the repository at this point in the history
`check_linker_flags` currently sets the *compiler* flags (via
`CMAKE_REQUIRED_FLAGS`), and thus implicitly relies on cmake's default
behavior of passing the compiler flags to the linker. This breaks when
cmake's build rules have been altered to not pollute the link line with
compiler flags (which can be desirable for build cleanliness). Instead,
set `CMAKE_EXE_LINKER_FLAGS` explicitly and use `CMP0056` to ensure the
linker flags are passed along. Additionally, since we're inside a
function, we can just alter the variable directly (as the alteration
will be limited to the scope of the function) rather than saving and
restoring the old value.

Differential Revision: https://reviews.llvm.org/D39431

llvm-svn: 316972
  • Loading branch information
smeenai committed Oct 31, 2017
1 parent b87b6bf commit 72404b8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 4 additions & 0 deletions llvm/CMakeLists.txt
Expand Up @@ -15,6 +15,10 @@ if (POLICY CMP0051)
cmake_policy(SET CMP0051 OLD)
endif()

if(POLICY CMP0056)
cmake_policy(SET CMP0056 NEW)
endif()

if(POLICY CMP0057)
cmake_policy(SET CMP0057 NEW)
endif()
Expand Down
4 changes: 1 addition & 3 deletions llvm/cmake/modules/CheckLinkerFlag.cmake
@@ -1,8 +1,6 @@
include(CheckCXXCompilerFlag)

function(check_linker_flag flag out_var)
set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}")
check_cxx_compiler_flag("" ${out_var})
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
endfunction()

0 comments on commit 72404b8

Please sign in to comment.