diff options
| author | Martin Storsjö <martin@martin.st> | 2023-03-24 00:37:29 +0200 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2023-04-04 10:55:36 -0700 |
| commit | b9857e6711a2d352a059d8b58a5d88b2ef16bb15 (patch) | |
| tree | d1a6ddbf70d59dac15013acaadf5612aadedaf2b | |
| parent | 35551022bf04a468ca73adeca7de8a06e89c7cc6 (diff) | |
| download | llvm-b9857e6711a2d352a059d8b58a5d88b2ef16bb15.tar.gz | |
[llvm-rc] Look for "clang-<major>" when locating a suitable preprocessor
In some cases, there's no adjacent executable named "clang" or
"clang-cl", but one name "clang-<major>". This logic doesn't
cover every possible deployment setup of course, but should
cover more fairly common/reasonable cases.
See
https://github.com/curl/curl-for-win/commit/caaae171ac43af5b883403714dafd42030d8de61#commitcomment-105808524
for discussion about a case where this would have been helpful.
Differential Revision: https://reviews.llvm.org/D146794
(cherry picked from commit 282744a9ce18120dc0a6eceb02693b36980d9498)
| -rw-r--r-- | llvm/tools/llvm-rc/llvm-rc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/tools/llvm-rc/llvm-rc.cpp b/llvm/tools/llvm-rc/llvm-rc.cpp index b6b44d4f5899..30c1569bc956 100644 --- a/llvm/tools/llvm-rc/llvm-rc.cpp +++ b/llvm/tools/llvm-rc/llvm-rc.cpp @@ -18,6 +18,7 @@ #include "ResourceScriptToken.h" #include "llvm/ADT/Triple.h" +#include "llvm/Config/llvm-config.h" #include "llvm/Object/WindowsResource.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" @@ -137,10 +138,12 @@ ErrorOr<std::string> findClang(const char *Argv0, StringRef Triple) { StringRef Parent = llvm::sys::path::parent_path(Argv0); ErrorOr<std::string> Path = std::error_code(); std::string TargetClang = (Triple + "-clang").str(); + std::string VersionedClang = ("clang-" + Twine(LLVM_VERSION_MAJOR)).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 : {TargetClang.c_str(), "clang", "clang-cl"}) { + for (const auto *Name : + {TargetClang.c_str(), VersionedClang.c_str(), "clang", "clang-cl"}) { Path = sys::findProgramByName(Name, Parent); if (Path) return Path; |