Set NO_DEAD_STRIP for clang after llvm r198087.

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

diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index 562b902d837486073e9bbb1015363e4c51e9afc0..c12891805d23322b2b12cdf7b8ba998dd29b5761 100644 (file)
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -24,6 +24,9 @@ endif
 # Include tool version information on OS X.
 TOOL_INFO_PLIST := Info.plist
 
+# Support plugins.
+NO_DEAD_STRIP := 1
+
 # Include this here so we can get the configuration of the targets that have
 # been configured for construction. We have to do this early so we can set up
 # LINK_COMPONENTS before including Makefile.rules

diff --git a/tools/libclang/Makefile b/tools/libclang/Makefile
index 5b49dc06fe622fb67456d26476f2cdc85c1b9a41..dfd26dcff2d67194e1e838895c26f4b8237eafff 100644 (file)
--- a/tools/libclang/Makefile
+++ b/tools/libclang/Makefile
@@ -47,9 +47,6 @@ ifeq ($(HOST_OS),Darwin)
                            -Wl,$(LLVM_SUBMIT_VERSION).$(LLVM_SUBMIT_SUBVERSION)
     endif
 
-    # Extra options to override libtool defaults.
-    LLVMLibsOptions += -Wl,-dead_strip
-
     # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
     DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
     ifneq ($(DARWIN_VERS),8)