diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2023-06-13 01:04:21 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-06-14 01:04:55 -0400 |
| commit | d87d912e5d2345f3c2f73fffb36820040cc997fe (patch) | |
| tree | 37e81bc7520020383ee8fa5ade8cc7b8eb90f518 /mesonbuild | |
| parent | a6bf2c1e2c82daaabaf3b4575d25a9d14c500543 (diff) | |
| download | meson-d87d912e5d2345f3c2f73fffb36820040cc997fe.zip meson-d87d912e5d2345f3c2f73fffb36820040cc997fe.tar.gz meson-d87d912e5d2345f3c2f73fffb36820040cc997fe.tar.bz2 | |
compilers: fix detection of ifx compiler
The version output scraping for identifying strings checked for "IFORT"
in parentheses after the executable name, which is probably a mistake by
Intel. Current versions of ifx have "IFX" in parentheses there.
Detect both.
Fixes #11873
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/detect.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 1edd668..a591e87 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -749,7 +749,7 @@ def detect_fortran_compiler(env: 'Environment', for_machine: MachineChoice) -> C compiler, version, for_machine, is_cross, info, exe_wrap, full_version=full_version, linker=linker) - if 'ifx (IFORT)' in out: + if 'ifx (IFORT)' in out or 'ifx (IFX)' in out: cls = fortran.IntelLLVMFortranCompiler linker = guess_nix_linker(env, compiler, cls, version, for_machine) return cls( |