From 84b371c6451344f032d2c6f550c2711ec0776ca8 Mon Sep 17 00:00:00 2001 From: Ian Harvey Date: Sat, 26 Jun 2021 08:42:11 +0930 Subject: Update detect.py Adjust Intel Fortran compiler detection to handle changes in ifort logo with the introduction of the oneapi toolkit. See #8338. --- 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 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 -- cgit v1.1