diff options
| -rw-r--r-- | lib/Driver/Driver.cpp | 6 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 6c0668bff6..85debe8bb7 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -26,6 +26,7 @@ #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" +#include "llvm/System/Program.h" #include "InputInfo.h" @@ -879,6 +880,11 @@ llvm::sys::Path Driver::GetProgramPath(const char *Name, if (P.exists()) return P; + // Search path to increase accuracy of logging output. + P = llvm::sys::Program::FindProgramByName(Name); + if (!P.empty()) + return P; + return llvm::sys::Path(Name); } diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index b84a3e40d0..11c722e676 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -392,7 +392,9 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(II.getInputFilename()); } - Dest.addCommand(new Command("gcc", CmdArgs)); + const char *Exec = + Args.MakeArgString(getToolChain().GetProgramPath(C, "gcc").c_str()); + Dest.addCommand(new Command(Exec, CmdArgs)); } void gcc::Preprocess::RenderExtraToolArgs(ArgStringList &CmdArgs) const { |