diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-11-09 20:07:19 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-11-09 20:07:19 +0000 |
commit | 236db46f79ff1e4d1dacc1507241007144db9f28 (patch) | |
tree | bba1cb5dbbb9063cb40569555a2d39996681d989 /clang/lib/Driver/ToolChain.cpp | |
parent | 867ccd865e59a4be63a4a342a35177e10799ef1f (diff) | |
download | bcm5719-llvm-236db46f79ff1e4d1dacc1507241007144db9f28.tar.gz bcm5719-llvm-236db46f79ff1e4d1dacc1507241007144db9f28.zip |
This reverts commit r194330, r194329 and r194328.
The test was still failing on OS X and mingw.
llvm-svn: 194334
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
-rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 20e37ff6b8c..9fe03799f1d 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -146,28 +146,6 @@ std::string ToolChain::GetProgramPath(const char *Name) const { return D.GetProgramPath(Name, *this); } -std::string ToolChain::GetLinkerPath() const { - if (Arg *A = Args.getLastArg(options::OPT_fuse_ld_EQ)) { - StringRef Value = A->getValue(); - // If we're passed -fuse-ld= with no argument, or with the argument ld, - // then use whatever the default system linker is. - if (Value.empty() || Value == "ld") - return GetProgramPath("ld"); - std::string LinkerName = Value.str(); - std::string LD("ld."); - LD += LinkerName; - std::string LinkerPath = GetProgramPath(LD.c_str()); - bool Exists; - if (!llvm::sys::fs::exists(LinkerPath, Exists) && Exists) - return LinkerPath; - getDriver().Diag(diag::err_drv_invalid_linker_name) - << A->getAsString(Args); - return ""; - } - return GetProgramPath("ld"); -} - - types::ID ToolChain::LookupTypeForExtension(const char *Ext) const { return types::lookupTypeForExtension(Ext); } |