From b19530bd7dc99e0b5d71acd5cdf85af915b9ddcc Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 6 Oct 2021 10:32:13 -0700 Subject: Fix compiler detection for cl/clang-cl If the compiler specified is a path to a compiler, the current detection is broken. It needs to use just the compiler name instead. --- mesonbuild/compilers/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/compilers/detect.py') diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index a839279..5e0710b 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -363,7 +363,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin compiler = [compiler] compiler_name = os.path.basename(compiler[0]) - if not {'cl', 'cl.exe', 'clang-cl', 'clang-cl.exe'}.isdisjoint(compiler): + if any(os.path.basename(x) in {'cl', 'cl.exe', 'clang-cl', 'clang-cl.exe'} for x in compiler): # Watcom C provides it's own cl.exe clone that mimics an older # version of Microsoft's compiler. Since Watcom's cl.exe is # just a wrapper, we skip using it if we detect its presence -- cgit v1.1