From: Jacek Caban <jacek@codeweavers.com> Similar to how we check for in case of clang from the PATH. --- tools/winebuild/utils.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1f0cde60bf9..5492de99c90 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -227,7 +227,11 @@ struct strarray find_tool( const char *name, const char * const *names ) names++; } - if (!file && cc_command.count) file = find_clang_tool( cc_command, name ); + if (!file && cc_command.count) + { + file = find_clang_tool( cc_command, strmake( "llvm-%s", name )); + if (!file) file = find_clang_tool( cc_command, name ); + } if (!file) file = find_binary( "llvm", name ); if (!file) file = find_clang_tool( empty_strarray, strmake( "llvm-%s", name )); if (!file) file = find_clang_tool( empty_strarray, name ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10070