[llvm-branch-commits] [cfe-branch] r80545 - /cfe/branches/release_26/lib/Driver/Driver.cpp

[Tanya Lattner]

Author: tbrethou
Date: Mon Aug 31 01:17:38 2009
New Revision: 80545

URL: http://llvm.org/viewvc/llvm-project?rev=80545&view=rev
Log:
Merge from mainline.
Temporarily switch clang back to not using clang-cc by default for C++, and only
using clang-cc on i386 and x86_64.


Modified:
    cfe/branches/release_26/lib/Driver/Driver.cpp

Modified: cfe/branches/release_26/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_26/lib/Driver/Driver.cpp?rev=80545&r1=80544&r2=80545&view=diff

==============================================================================
--- cfe/branches/release_26/lib/Driver/Driver.cpp (original)
+++ cfe/branches/release_26/lib/Driver/Driver.cpp Mon Aug 31 01:17:38 2009
@@ -37,6 +37,9 @@
 using namespace clang::driver;
 using namespace clang;
 
+// Used to set values for "production" clang, for releases.
+#define USE_PRODUCTION_CLANG
+
 Driver::Driver(const char *_Name, const char *_Dir,
                const char *_DefaultHostTriple,
                const char *_DefaultImageName,
@@ -46,10 +49,20 @@
     DefaultImageName(_DefaultImageName),
     Host(0),
     CCCIsCXX(false), CCCEcho(false), CCCPrintBindings(false),
-    CCCGenericGCCName("gcc"), CCCUseClang(true), CCCUseClangCXX(true), 
+    CCCGenericGCCName("gcc"), CCCUseClang(true),
+#ifdef USE_PRODUCTION_CLANG
+    CCCUseClangCXX(false), 
+#else
+    CCCUseClangCXX(true), 
+#endif
     CCCUseClangCPP(true), CCCUsePCH(true),
     SuppressMissingInputWarning(false)
 {
+#ifdef USE_PRODUCTION_CLANG
+  // Only use clang on i386 and x86_64 by default, in a "production" build.
+  CCCClangArchs.insert("i386");
+  CCCClangArchs.insert("x86_64");
+#endif
 }
 
 Driver::~Driver() {