Driver/Darwin: Switch to using simplified tool chain by default -- what better

way to see what will break! :)

llvm-svn: 111840

1 files changed, 2 insertions, 6 deletions

diff --git a/clang/lib/Driver/HostInfo.cpp b/clang/lib/Driver/HostInfo.cpp
index 7c5e430bb7d..3adcbc0d7ca 100644
--- a/clang/lib/Driver/HostInfo.cpp
+++ b/clang/lib/Driver/HostInfo.cpp
@@ -113,12 +113,8 @@ ToolChain *DarwinHostInfo::CreateToolChain(const ArgList &Args,
     TCTriple.setArch(Arch);
 
     // If we recognized the arch, match it to the toolchains we support.
-    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.
+    if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb ||
+        Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64) {
       TC = new toolchains::DarwinGCC(*this, TCTriple);
     } else
       TC = new toolchains::Darwin_Generic_GCC(*this, TCTriple);