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

[Daniel Dunbar]

Author: ddunbar
Date: Fri Mar 26 17:41:03 2010
New Revision: 99660

URL: http://llvm.org/viewvc/llvm-project?rev=99660&view=rev
Log:
Driver/Darwin: Support CCC_ENABLE_NEW_DARWIN_TOOLCHAIN as an environment
override to enable use of the DarwinClang tool chain on all platforms (not just
ARM).

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=99660&r1=99659&r2=99660&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/HostInfo.cpp (original)
+++ cfe/trunk/lib/Driver/HostInfo.cpp Fri Mar 26 17:41:03 2010
@@ -144,13 +144,15 @@
     TCTriple.setArch(Arch);
 
     // If we recognized the arch, match it to the toolchains we support.
-    if (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, DarwinVersion);
+    } 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, DarwinVersion,
                                      GCCVersion);
-    } else if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb)
-      TC = new toolchains::DarwinClang(*this, TCTriple, DarwinVersion);
-    else
+    } else
       TC = new toolchains::Darwin_Generic_GCC(*this, TCTriple);
   }