commit a73a9845e2bd560861f9b7cfb6bd428915b8eab1
author Daniel Dunbar <daniel@zuster.org> Mon Aug 02 05:44:04 2010 +0000
committer Daniel Dunbar <daniel@zuster.org> Mon Aug 02 05:44:04 2010 +0000
tree fa7ad7f8e03255296b1a7d443a01e61611b51a0f
parent 3ae26dfc917c08c16a5edfa71b6480662a1c6e97

Driver: Have -ccc-host-triple simply override the default in the driver, for
now.

llvm-svn: 110027

clang/lib/Driver/Driver.cpp

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 7fbbe0b..cc0cf9f 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -175,7 +175,6 @@
   bool CCCPrintOptions = false, CCCPrintActions = false;
 
   const char **Start = argv + 1, **End = argv + argc;
-  const char *HostTriple = DefaultHostTriple.c_str();
 
   InputArgList *Args = ParseArgStrings(Start, End);
 
@@ -225,14 +224,16 @@
       Cur = Split.second;
     }
   }
+  // 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_ccc_host_triple))
-    HostTriple = A->getValue(*Args);
+    DefaultHostTriple = A->getValue(*Args);
   if (const Arg *A = Args->getLastArg(options::OPT_ccc_install_dir))
     Dir = A->getValue(*Args);
   if (const Arg *A = Args->getLastArg(options::OPT_B))
     PrefixDir = A->getValue(*Args);
 
-  Host = GetHostInfo(HostTriple);
+  Host = GetHostInfo(DefaultHostTriple.c_str());
 
   // Perform the default argument translations.
   DerivedArgList *TranslatedArgs = TranslateInputArgs(*Args);