diff options
| author | William D. Jones <thor0505@comcast.net> | 2021-10-31 19:23:47 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2021-10-31 21:38:53 -0400 |
| commit | 94a5ffabf309cd09b66a6f19f5eebcee0ba34af9 (patch) | |
| tree | f5c423d54961415203fed34e834174fbea197046 /mesonbuild/compilers/detect.py | |
| parent | 384151c54198fcd4a9be6d4df984c9f09823a458 (diff) | |
| download | meson-94a5ffabf309cd09b66a6f19f5eebcee0ba34af9.zip meson-94a5ffabf309cd09b66a6f19f5eebcee0ba34af9.tar.gz meson-94a5ffabf309cd09b66a6f19f5eebcee0ba34af9.tar.bz2 | |
Add 64-bit paths to check for unsupported Watcom cl.exe clones.
Diffstat (limited to 'mesonbuild/compilers/detect.py')
| -rw-r--r-- | mesonbuild/compilers/detect.py | 5 |
1 files changed, 4 insertions, 1 deletions
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: |