Index: tools/driver/Makefile
===================================================================
--- tools/driver/Makefile	(revision 198076)
+++ tools/driver/Makefile	(working copy)
@@ -24,6 +24,9 @@
 # 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
Index: tools/libclang/Makefile
===================================================================
--- tools/libclang/Makefile	(revision 198076)
+++ tools/libclang/Makefile	(working copy)
@@ -47,9 +47,6 @@
                            -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)