diff --git a/llvm/lib/CompilerDriver/Action.cpp b/llvm/lib/CompilerDriver/Action.cpp
index 54b55d0..19f5bba 100644
--- a/llvm/lib/CompilerDriver/Action.cpp
+++ b/llvm/lib/CompilerDriver/Action.cpp
@@ -57,7 +57,8 @@
     sys::Path prog(name);
 
     if (!prog.isAbsolute()) {
-      prog = FindExecutable(name, ProgramName, (void *)(intptr_t)&Main);
+      prog = PrependMainExecutablePath(name, ProgramName,
+                                       (void *)(intptr_t)&Main);
 
       if (!prog.canExecute()) {
         prog = sys::Program::FindProgramByName(name);