1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index f827aaf166f..1794e8e7070 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -1885,11 +1885,10 @@ std::string Driver::GetProgramPath(const char *Name,
   }
 
   // If all else failed, search the path.
-  for (const auto &TargetSpecificExecutable : TargetSpecificExecutables) {
-    auto P = llvm::sys::findProgramByName(TargetSpecificExecutable);
-    if (P)
+  for (const auto &TargetSpecificExecutable : TargetSpecificExecutables)
+    if (llvm::ErrorOr<std::string> P =
+            llvm::sys::findProgramByName(TargetSpecificExecutable))
       return *P;
-  }
 
   return Name;
 }