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 | 4364558956435b0c97f35f2ffaaafa55bf849c91 (patch) | |
| tree | d1d3ea9edd9ebf9de7df6eb9dc60226f354f9db9 /clang/lib/Driver/ToolChains.cpp | |
| parent | 584344f2ecd8be663ee161860be3f97c1f4cd064 (diff) | |
| download | bcm5719-llvm-4364558956435b0c97f35f2ffaaafa55bf849c91.tar.gz bcm5719-llvm-4364558956435b0c97f35f2ffaaafa55bf849c91.zip | |
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.
llvm-svn: 100915
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 105eab06af5..4bb3246eddc 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/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 + |
