Jacek Caban : winebuild: Use find_clang_tool for ld and nm tools.
Alexandre Julliard
julliard at winehq.org
Wed Nov 10 15:34:47 CST 2021
Module: wine
Branch: master
Commit: c41059bcbafacd4725d48327101087a36d36cd7c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c41059bcbafacd4725d48327101087a36d36cd7c
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Nov 10 17:48:26 2021 +0100
winebuild: Use find_clang_tool for ld and nm tools.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/winebuild/utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 16b1fc2d968..07acb80eb8a 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -273,9 +273,9 @@ struct strarray find_tool( const char *name, const char * const *names )
names++;
}
- if (!file && names == alt_names + 1)
+ if (!file && strcmp( name, "as" )) /* llvm-as is not a gas replacement */
{
- if (cc_command.count) file = find_clang_tool( cc_command, "lld-link" );
+ if (cc_command.count) file = find_clang_tool( cc_command, name );
if (!file && !(file = find_binary( "llvm", name )))
{
struct strarray clang = empty_strarray;
More information about the wine-cvs
mailing list