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.)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@198200 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18e472f3017eb83e2b4f8860524441034393f7b7..c8f71029c9e5b09e20be840652e0dd285159255c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -305,6 +305,7 @@ macro(add_clang_library name)
     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 3526006bbbc8639b2efcc6b9c5cc6cb82f88219e..021c755c014882c19b2c5f92aa06439bb1f724df 100644 (file)
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -16,6 +16,9 @@ set( LLVM_LINK_COMPONENTS
   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 aa050d5356390495aca7187f4865b74e7ce68e61..881a86923acfbbc063012f217633f2a5cb414473 100644 (file)
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -84,8 +84,7 @@ if( LLVM_ENABLE_PIC )
   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}")