[cfe-commits] r112138 - /cfe/trunk/lib/Driver/HostInfo.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Aug 25 20:41:44 2010
New Revision: 112138

URL: http://llvm.org/viewvc/llvm-project?rev=112138&view=rev
Log:
Driver/Darwin: Switch back to old toolchain, looks like new one isn't quite
ready yet.

Modified:
    cfe/trunk/lib/Driver/HostInfo.cpp

Modified: cfe/trunk/lib/Driver/HostInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/HostInfo.cpp?rev=112138&r1=112137&r2=112138&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/HostInfo.cpp (original)
+++ cfe/trunk/lib/Driver/HostInfo.cpp Wed Aug 25 20:41:44 2010
@@ -113,9 +113,13 @@
     TCTriple.setArch(Arch);
 
     // If we recognized the arch, match it to the toolchains we support.
-    if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb ||
-        Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64) {
+    const char *UseNewToolChain = ::getenv("CCC_ENABLE_NEW_DARWIN_TOOLCHAIN");
+    if (UseNewToolChain || 
+        Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb) {
       TC = new toolchains::DarwinClang(*this, TCTriple);
+    } else if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64) {
+      // We still use the legacy DarwinGCC toolchain on X86.
+      TC = new toolchains::DarwinGCC(*this, TCTriple);
     } else
       TC = new toolchains::Darwin_Generic_GCC(*this, TCTriple);
   }