diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 7 | ||||
| -rw-r--r-- | clang/tools/driver/driver.cpp | 8 |
2 files changed, 6 insertions, 9 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; } diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index 50427da460b..57db0261a7b 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -353,12 +353,10 @@ static void SetInstallDir(SmallVectorImpl<const char *> &argv, SmallString<128> InstalledPath(argv[0]); // Do a PATH lookup, if there are no directory components. - if (llvm::sys::path::filename(InstalledPath) == InstalledPath) { - auto Tmp = llvm::sys::findProgramByName( - llvm::sys::path::filename(InstalledPath.str())); - if (Tmp) + if (llvm::sys::path::filename(InstalledPath) == InstalledPath) + if (llvm::ErrorOr<std::string> Tmp = llvm::sys::findProgramByName( + llvm::sys::path::filename(InstalledPath.str()))) InstalledPath = *Tmp; - } llvm::sys::fs::make_absolute(InstalledPath); InstalledPath = llvm::sys::path::parent_path(InstalledPath); if (llvm::sys::fs::exists(InstalledPath.c_str())) |
