diff options
| author | Ian Harvey <ian@AD.MEGMS.NET.AU> | 2021-06-26 08:42:11 +0930 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-06-27 17:50:30 +0300 |
| commit | 84b371c6451344f032d2c6f550c2711ec0776ca8 (patch) | |
| tree | 1538c8789a34ac82ed322ac139455ceb181988ff | |
| parent | 8f7343831bb78e6801c93cd45e4edfeed65bc437 (diff) | |
| download | meson-84b371c6451344f032d2c6f550c2711ec0776ca8.zip meson-84b371c6451344f032d2c6f550c2711ec0776ca8.tar.gz meson-84b371c6451344f032d2c6f550c2711ec0776ca8.tar.bz2 | |
Update detect.py
Adjust Intel Fortran compiler detection to handle changes in ifort logo with the introduction of the oneapi toolkit. See #8338.
| -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 d9c4ffc..59eac85 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -721,7 +721,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 'Intel(R) Visual Fortran' in err: + if 'Intel(R) Visual Fortran' in err or 'Intel(R) Fortran' in err: version = search_version(err) target = 'x86' if 'IA-32' in err else 'x86_64' cls = IntelClFortranCompiler |