diff options
| author | L. E. Segovia <amy@amyspark.me> | 2022-11-30 21:36:12 -0300 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-02-20 09:58:34 -0500 |
| commit | c2b0ca0fb9d7e6850874ae7c1c755982676f593d (patch) | |
| tree | 222bf24390f150d13ad0d04be420b2bd786dfd3a /mesonbuild/compilers/detect.py | |
| parent | 744e6ebe1d5f214fd54727abde0726160218a1f0 (diff) | |
| download | meson-c2b0ca0fb9d7e6850874ae7c1c755982676f593d.zip meson-c2b0ca0fb9d7e6850874ae7c1c755982676f593d.tar.gz meson-c2b0ca0fb9d7e6850874ae7c1c755982676f593d.tar.bz2 | |
nasm: Detect and use MSVC linker if present
Fixes #11082
Diffstat (limited to 'mesonbuild/compilers/detect.py')
| -rw-r--r-- | mesonbuild/compilers/detect.py | 3 |
1 files changed, 3 insertions, 0 deletions
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 = {} |