[cfe-commits] r85392 - /cfe/trunk/lib/Driver/Tools.cpp

[Edward O'Callaghan]

Author: evocallaghan
Date: Wed Oct 28 10:13:08 2009
New Revision: 85392

URL: http://llvm.org/viewvc/llvm-project?rev=85392&view=rev
Log:
Fix for PR4887, Credit to Jonathan Gray.

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

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=85392&r1=85391&r2=85392&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Oct 28 10:13:08 2009
@@ -2345,9 +2345,12 @@
     }
   }
 
+  std::string Triple = getToolChain().getTripleString();
+  if (Triple.substr(0, 6) == "x86_64")
+	Triple.replace(0, 6, "amd64");
   CmdArgs.push_back(MakeFormattedString(Args,
                            llvm::format("-L/usr/lib/gcc-lib/%s/3.3.5",
-                                    getToolChain().getTripleString().c_str())));
+                                    Triple.c_str())));
 
   Args.AddAllArgs(CmdArgs, options::OPT_L);
   Args.AddAllArgs(CmdArgs, options::OPT_T_Group);