diff options
author | Daniel Dunbar <daniel@zuster.org> | 2010-04-10 01:24:22 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2010-04-10 01:24:22 +0000 |
commit | 8bc9c550128c0662a04234dc262628c54c76b1ea (patch) | |
tree | cc6255a2de7f6bbc435d020481916fd129c6088a /lib/Driver/ToolChains.cpp | |
parent | 0b3c773bdc4f5d5f3aaf882b2f7a5f14df6041e0 (diff) |
Driver/Darwin/x86: When linking, incorporate -L paths based on the path where
Clang is installed. This is designed to match gcc, and is important when
installed in a non-standard location.
- This is gross, but no worse than ever. It will die when we finally move to
the compiler-rt based toolchain, any day now.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@100915 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/ToolChains.cpp')
-rw-r--r-- | lib/Driver/ToolChains.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 105eab06af..4bb3246edd 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -225,10 +225,17 @@ void DarwinGCC::AddLinkSearchPathArgs(const ArgList &Args, CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir + "/x86_64")); } + CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/" + ToolChainDir)); + CmdArgs.push_back(Args.MakeArgString("-L" + getDriver().Dir + "/../lib/gcc/" + + ToolChainDir)); + CmdArgs.push_back(Args.MakeArgString("-L" + getDriver().Dir + "/../lib/gcc")); CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir)); // Intentionally duplicated for (temporary) gcc bug compatibility. CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir)); + CmdArgs.push_back(Args.MakeArgString("-L" + getDriver().Dir + "/../lib/" + + ToolChainDir)); + CmdArgs.push_back(Args.MakeArgString("-L" + getDriver().Dir + "/../lib")); CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir + "/../../../" + ToolChainDir)); CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir + |