diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2015-11-20 20:49:39 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2015-11-20 20:49:39 +0000 |
| commit | 39719a77d151b9070d6d5fcd53dfff2f65eea6b2 (patch) | |
| tree | 10843d9cf2a8afd0ccd869d6cd2517361c6efa7e /clang/lib/Driver/ToolChains.cpp | |
| parent | 0d7f89d1ac148f105adddafe3ad4e9e4102b220e (diff) | |
| download | bcm5719-llvm-39719a77d151b9070d6d5fcd53dfff2f65eea6b2.tar.gz bcm5719-llvm-39719a77d151b9070d6d5fcd53dfff2f65eea6b2.zip | |
Driver: Defer computation of linker path until it is needed.
This allows us to construct Linux toolchains without a valid linker. This
is needed for example to build a CUDA device toolchain after r253385.
llvm-svn: 253707
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index d8603023e48..b7984c5482b 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -2455,8 +2455,7 @@ MipsLLVMToolChain::MipsLLVMToolChain(const Driver &D, getFilePaths().push_back(computeSysRoot() + "/usr/lib" + LibSuffix); // Use LLD by default. - if (!Args.getLastArg(options::OPT_fuse_ld_EQ)) - Linker = GetProgramPath("lld"); + DefaultLinker = "lld"; } void MipsLLVMToolChain::AddClangSystemIncludeArgs( @@ -2837,8 +2836,6 @@ NaClToolChain::NaClToolChain(const Driver &D, const llvm::Triple &Triple, break; } - // Use provided linker, not system linker - Linker = GetLinkerPath(); NaClArmMacrosPath = GetFilePath("nacl-arm-macros.s"); } @@ -3693,8 +3690,6 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) GCCInstallation.getTriple().str() + "/bin") .str()); - Linker = GetLinkerPath(); - Distro Distro = DetectDistro(D, Arch); if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) { |
