Driver: Setup file and program search paths in tool chains.

llvm-svn: 67529

1 files changed, 2 insertions, 9 deletions

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index db084262e9c..df71c97215a 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -920,15 +920,8 @@ llvm::sys::Path Driver::GetProgramPath(const char *Name,
       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;
-
-  // Search path to increase accuracy of logging output.
-  P = llvm::sys::Program::FindProgramByName(Name);
+  // If all else failed, search the path.
+  llvm::sys::Path P(llvm::sys::Program::FindProgramByName(Name));
   if (!P.empty())
     return P;