From c2b0ca0fb9d7e6850874ae7c1c755982676f593d Mon Sep 17 00:00:00 2001 From: "L. E. Segovia" Date: Wed, 30 Nov 2022 21:36:12 -0300 Subject: nasm: Detect and use MSVC linker if present Fixes #11082 --- mesonbuild/compilers/detect.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mesonbuild/compilers/detect.py') diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 1f37833..1ef734f 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -189,6 +189,9 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker trials = [['xilib']] elif is_windows() and compiler.id == 'pgi': # this handles cpp / nvidia HPC, in addition to just c/fortran trials = [['ar']] # For PGI on Windows, "ar" is just a wrapper calling link/lib. + elif is_windows() and compiler.id == 'nasm': + # This may well be LINK.EXE if it's under a MSVC environment + trials = [defaults['vs_static_linker'], defaults['clang_cl_static_linker']] + default_linkers else: trials = default_linkers popen_exceptions = {} -- cgit v1.1