diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 7 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 6202702f097..16e7e85ea8b 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -294,7 +294,7 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { } if (C.getArgs().hasArg(options::OPT_print_libgcc_file_name)) { - llvm::outs() << GetProgramPath("libgcc.a", TC).toString() << "\n"; + llvm::outs() << GetProgramPath("libgcc.a", TC, true).toString() << "\n"; return false; } @@ -925,13 +925,14 @@ llvm::sys::Path Driver::GetFilePath(const char *Name, } llvm::sys::Path Driver::GetProgramPath(const char *Name, - const ToolChain &TC) const { + const ToolChain &TC, + bool WantFile) const { const ToolChain::path_list &List = TC.getProgramPaths(); for (ToolChain::path_list::const_iterator it = List.begin(), ie = List.end(); it != ie; ++it) { llvm::sys::Path P(*it); P.appendComponent(Name); - if (P.exists()) + if (WantFile ? P.exists() : P.canExecute()) return P; } diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index aed58c94221..a7f65502053 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -30,6 +30,7 @@ llvm::sys::Path ToolChain::GetFilePath(const Compilation &C, } llvm::sys::Path ToolChain::GetProgramPath(const Compilation &C, - const char *Name) const { - return Host.getDriver().GetProgramPath(Name, *this); + const char *Name, + bool WantFile) const { + return Host.getDriver().GetProgramPath(Name, *this, WantFile); } |
