Port r198088 (set NO_DEAD_STRIP for clang) from make to cmake.
Also stop setting passing -dead_strip explicitly for libclang and instead
rely on this now happening by default. (And make it happen by default for
add_clang_library, which doesn't use the library cmake functions from llvm.)
llvm-svn: 198200
GitOrigin-RevId: 194c00935263e88e3222a531ba1f3f2570b06eb3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18e472f..c8f7102 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -305,6 +305,7 @@
set(libkind)
endif()
add_library( ${name} ${libkind} ${srcs} )
+ add_dead_strip( ${name} )
if( LLVM_COMMON_DEPENDS )
add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
endif( LLVM_COMMON_DEPENDS )
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 3526006..021c755 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -16,6 +16,9 @@
Vectorize
)
+# Support plugins.
+set(LLVM_NO_DEAD_STRIP 1)
+
add_clang_executable(clang
driver.cpp
cc1_main.cpp
diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index aa050d5..881a869 100644
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -84,8 +84,7 @@
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- set(LIBCLANG_LINK_FLAGS
- " -Wl,-compatibility_version -Wl,1 -Wl,-dead_strip")
+ set(LIBCLANG_LINK_FLAGS " -Wl,-compatibility_version -Wl,1")
if (DEFINED ${LLVM_SUBMIT_VERSION})
set(LIBCLANG_LINK_FLAGS
"${LIBCLANG_LINK_FLAGS} -Wl,-current_version -Wl,${LLVM_SUBMIT_VERSION}.${LLVM_SUBMIT_SUBVERSION}")