diff options
| author | Reid Kleckner <reid@kleckner.net> | 2014-04-25 01:44:20 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2014-04-25 01:44:20 +0000 |
| commit | 65fc0e2c00e84cffe07efb21d62a634730925a2e (patch) | |
| tree | cb8de8f4b02c56ccb44b19701418c7023fd35907 /llvm | |
| parent | 0fef333dee6f12b279eb630f3b9b5179d9232168 (diff) | |
| download | bcm5719-llvm-65fc0e2c00e84cffe07efb21d62a634730925a2e.tar.gz bcm5719-llvm-65fc0e2c00e84cffe07efb21d62a634730925a2e.zip | |
Change llvm-config --ldflags to report ${CMAKE_CXX_LINK_FLAGS}
Should fix PR19526.
When Oscar added this code in the intial CMake build system port, he had
a TODO saying that ${CMAKE_SHARED_LINKER_FLAGS} was probably wrong. I
agree. I'm using ${CMAKE_CXX_LINK_FLAGS} to point LLVM at my custom
installation of gcc 4.recent, so that seems more correct. With this
change, I can build creduce against an installed clang, and it picks up
the write flags from --ldflags.
llvm-svn: 207171
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/tools/llvm-config/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt index 6f29a828f51..8d8376271de 100644 --- a/llvm/tools/llvm-config/CMakeLists.txt +++ b/llvm/tools/llvm-config/CMakeLists.txt @@ -16,7 +16,8 @@ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -set(LLVM_LDFLAGS ${CMAKE_SHARED_LINKER_FLAGS}) +# Use the C++ link flags, since they should be a superset of C link flags. +set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}") |
