Revert r148138; it's causing test failures.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148141 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 47598f8..b6c0756 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -148,7 +148,7 @@
     }
   }
 
-  // If -target arch-pc-win32-macho option specified, we're
+  // If -ccc-host-triple arch-pc-win32-macho option specified, we're
   // generating code for Win32 ABI. No need to emit
   // __ENVIRONMENT_XX_OS_VERSION_MIN_REQUIRED__.
   if (PlatformName == "win32") {
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 19ed16c..ce4a89e 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -305,7 +305,7 @@
   }
   // FIXME: We shouldn't overwrite the default host triple here, but we have
   // nowhere else to put this currently.
-  if (const Arg *A = Args->getLastArg(options::OPT_target))
+  if (const Arg *A = Args->getLastArg(options::OPT_ccc_host_triple))
     DefaultTargetTriple = A->getValue(*Args);
   if (const Arg *A = Args->getLastArg(options::OPT_ccc_install_dir))
     Dir = InstalledDir = A->getValue(*Args);