Replace CLANG_IS_PRODUCTION with CLANG_PLUGIN_SUPPORT.

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

diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index c003df8486273dc6069c516445879ac07fcdecd7..9442ba65da9da593e0a843626587c470a5b694bb 100644 (file)
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -16,11 +16,11 @@ set( LLVM_LINK_COMPONENTS
   Vectorize
   )
 
-option(CLANG_IS_PRODUCTION "Build clang without plugin support" OFF)
+option(CLANG_PLUGIN_SUPPORT "Build clang with plugin support" ON)
 
 # Support plugins. This must be before add_clang_executable as it reads
 # LLVM_NO_DEAD_STRIP.
-if(NOT CLANG_IS_PRODUCTION)
+if(CLANG_PLUGIN_SUPPORT)
   set(LLVM_NO_DEAD_STRIP 1)
 endif()
 
@@ -40,7 +40,7 @@ target_link_libraries(clang
 set_target_properties(clang PROPERTIES VERSION ${CLANG_EXECUTABLE_VERSION})
 
 # Support plugins.
-if(NOT CLANG_IS_PRODUCTION)
+if(CLANG_PLUGIN_SUPPORT)
   set_target_properties(clang PROPERTIES ENABLE_EXPORTS 1)
 endif()
 

diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index c12891805d23322b2b12cdf7b8ba998dd29b5761..22c8c9f6329da93ef0c6e5049eeb5b95e91ee066 100644 (file)
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -11,12 +11,6 @@ CLANG_LEVEL := ../..
 TOOLNAME = clang
 TOOLALIAS = clang++
 
-# We don't currently expect production Clang builds to be interested in
-# plugins. This is important for startup performance.
-ifdef CLANG_IS_PRODUCTION
-TOOL_NO_EXPORTS := 1
-endif
-
 ifdef CLANG_ORDER_FILE
 TOOL_ORDER_FILE := $(CLANG_ORDER_FILE)
 endif
@@ -24,14 +18,19 @@ 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
 include $(CLANG_LEVEL)/../../Makefile.config
 
+# Have the option of not supporting plugins. This is important for startup
+# performance.
+ifeq ($(CLANG_PLUGIN_SUPPORT), 1)
+NO_DEAD_STRIP := 1
+else
+TOOL_NO_EXPORTS := 1
+endif
+
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
                    instrumentation ipo irreader linker objcarcopts option \
                    selectiondag