From a160c9208903c50bd5d6f214ad84d44ad788454f Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 14 Jan 2021 15:41:30 +0000 Subject: [PATCH] Bug 1480005 - Always use llvm-lib when targetting Windows. r=firefox-build-system-reviewers,dmajor The linker is always lld-link, as we don't support MSVC anymore, so the fallback to "lib" is never used. Differential Revision: https://phabricator.services.mozilla.com/D101678 --- build/moz.configure/toolchain.configure | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 51c968429d6f..b88478bbe140 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -2865,20 +2865,13 @@ def rc_names(c_compiler, toolchain_prefix): check_prog("RC", rc_names, paths=toolchain_search_path, when=target_is_windows) -@depends(link, toolchain_prefix, c_compiler) -def ar_config(link, toolchain_prefix, c_compiler): - if c_compiler.type == "clang-cl" and link: - # if LINKER is set, it's either for lld-link or link - if "lld-link" in link: - return namespace( - names=("llvm-lib",), - flags=("-llvmlibthin", "-out:$@"), - ) - else: - return namespace( - names=("lib",), - flags=("-NOLOGO", "-OUT:$@"), - ) +@depends(toolchain_prefix, c_compiler) +def ar_config(toolchain_prefix, c_compiler): + if c_compiler.type == "clang-cl": + return namespace( + names=("llvm-lib",), + flags=("-llvmlibthin", "-out:$@"), + ) return namespace( names=tuple("%s%s" % (p, "ar") for p in (toolchain_prefix or ()) + ("",)), flags=("crs", "$@"),