From: Edward O'Callaghan Date: Wed, 28 Oct 2009 15:13:08 +0000 (+0000) Subject: Fix for PR4887, Credit to Jonathan Gray. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7e18200e614a5e619602a088544c85ac8305a1f;p=clang Fix for PR4887, Credit to Jonathan Gray. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85392 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 0e7474c7f6..357dcb3d90 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2345,9 +2345,12 @@ void openbsd::Link::ConstructJob(Compilation &C, const JobAction &JA, } } + 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);