diff --git a/llvm/tools/llvm-rc/llvm-rc.cpp b/llvm/tools/llvm-rc/llvm-rc.cpp index d43994deecc0..b6d204706134 100644 --- a/llvm/tools/llvm-rc/llvm-rc.cpp +++ b/llvm/tools/llvm-rc/llvm-rc.cpp @@ -124,13 +124,14 @@ std::string createTempFile(const Twine &Prefix, StringRef Suffix) { return static_cast(FileName); } -ErrorOr findClang(const char *Argv0) { +ErrorOr findClang(const char *Argv0, StringRef Triple) { StringRef Parent = llvm::sys::path::parent_path(Argv0); ErrorOr Path = std::error_code(); + std::string TargetClang = (Triple + "-clang").str(); if (!Parent.empty()) { // First look for the tool with all potential names in the specific // directory of Argv0, if known - for (const auto *Name : {"clang", "clang-cl"}) { + for (const auto *Name : {TargetClang.c_str(), "clang", "clang-cl"}) { Path = sys::findProgramByName(Name, Parent); if (Path) return Path; @@ -219,7 +220,7 @@ bool preprocess(StringRef Src, StringRef Dst, const RcOptions &Opts, if (Opts.PrintCmdAndExit) { Clang = "clang"; } else { - ErrorOr ClangOrErr = findClang(Argv0); + ErrorOr ClangOrErr = findClang(Argv0, Opts.Triple); if (ClangOrErr) { Clang = *ClangOrErr; } else {