diff options
author | emaste <emaste@FreeBSD.org> | 2015-02-25 22:32:32 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2015-02-25 22:32:32 +0000 |
commit | c01620e95226f709ada46f702fc18f0efbde253d (patch) | |
tree | 9bcf4353dc620447ca7cbce552fc58d26b5fcc76 /contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp | |
parent | a98c93ae725cddb4e66eb395835b27bc9f2587e5 (diff) | |
download | FreeBSD-src-c01620e95226f709ada46f702fc18f0efbde253d.zip FreeBSD-src-c01620e95226f709ada46f702fc18f0efbde253d.tar.gz |
Implement the -fuse-ld= option.
Merge upstream Clang revision 211785:
This commit implements the -fuse-ld= option, so that the user
can specify -fuse-ld=bfd to use ld.bfd.
This commit re-applies r194328 with some test case changes.
It seems that r194328 was breaking macosx or mingw build
because clang can't find ld.bfd or ld.gold in the given sysroot.
We should use -B to specify the executable search path instead.
Patch originally by David Chisnall.
This is a direct commit to stable/10 as this is change is already
included in Clang 3.5 in HEAD. The patch is also reworked slightly for
Clang 3.4.1.
Reviewed by: dim
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp')
-rw-r--r-- | contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp b/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp index f90ab69..5588941 100644 --- a/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp +++ b/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp @@ -2420,7 +2420,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + GCCInstallation.getTriple().str() + "/bin").str()); - Linker = GetProgramPath("ld"); + Linker = GetLinkerPath(); Distro Distro = DetectDistro(Arch); |