From 94a5ffabf309cd09b66a6f19f5eebcee0ba34af9 Mon Sep 17 00:00:00 2001 From: "William D. Jones" Date: Sun, 31 Oct 2021 19:23:47 -0400 Subject: Add 64-bit paths to check for unsupported Watcom cl.exe clones. --- mesonbuild/compilers/detect.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mesonbuild/compilers/detect.py') diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 4df167b..03c5226 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -378,9 +378,12 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin return os.path.normcase(os.path.abspath(p)) watcom_cls = [sanitize(os.path.join(os.environ['WATCOM'], 'BINNT', 'cl')), - sanitize(os.path.join(os.environ['WATCOM'], 'BINNT', 'cl.exe'))] + sanitize(os.path.join(os.environ['WATCOM'], 'BINNT', 'cl.exe')), + sanitize(os.path.join(os.environ['WATCOM'], 'BINNT64', 'cl')), + sanitize(os.path.join(os.environ['WATCOM'], 'BINNT64', 'cl.exe')),] found_cl = sanitize(shutil.which('cl')) if found_cl in watcom_cls: + mlog.debug('Skipping unsupported cl.exe clone at:', found_cl) continue arg = '/?' elif 'armcc' in compiler_name: -- cgit v1.1