Driver: Support ToolChain specific path lists to search for files and
programs.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67229 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 9d913a1..f3d2410 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -849,13 +849,36 @@
llvm::sys::Path Driver::GetFilePath(const char *Name,
const ToolChain &TC) const {
- // FIXME: Implement.
+ const ToolChain::path_list &List = TC.getFilePaths();
+ 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())
+ return P;
+ }
+
return llvm::sys::Path(Name);
}
llvm::sys::Path Driver::GetProgramPath(const char *Name,
const ToolChain &TC) const {
- // FIXME: Implement.
+ 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())
+ return P;
+ }
+
+ // As a last resort, always search in our directory before pulling
+ // from the path.
+ llvm::sys::Path P(Dir);
+ P.appendComponent(Name);
+ if (P.exists())
+ return P;
+
return llvm::sys::Path(Name);
}