diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index c003df8..8cb2d16 100644
--- 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_NO_PLUGIN_SUPPORT "Build clang without plugin support" OFF)
 
 # Support plugins. This must be before add_clang_executable as it reads
 # LLVM_NO_DEAD_STRIP.
-if(NOT CLANG_IS_PRODUCTION)
+if(NOT CLANG_NO_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(NOT CLANG_NO_PLUGIN_SUPPORT)
   set_target_properties(clang PROPERTIES ENABLE_EXPORTS 1)
 endif()
 
diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index c128918..94d9fa6 100644
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -11,10 +11,12 @@ 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
+# Have the option of not supporting plugins. This is important for startup
+# performance.
+ifdef CLANG_NO_PLUGIN_SUPPORT
 TOOL_NO_EXPORTS := 1
+else
+NO_DEAD_STRIP := 1
 endif
 
 ifdef CLANG_ORDER_FILE
@@ -24,9 +26,6 @@ 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