summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2017-04-25 00:09:15 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-04-28 22:30:26 +0300
commitfbbd7289db32b50a4bb6044b064310d03cee9b7e (patch)
tree8139890bff57777bc5ec5744cb56858d1bf260e2
parentde431822059f35f40f74b17784f75b0dc7532b8e (diff)
downloadmeson-fbbd7289db32b50a4bb6044b064310d03cee9b7e.tar.gz
Detect intel fortran compiler
The intel fortran compiler "ifort" was not listed in the list of default fortran compilers. This caused it to not be found unless explicitly set via the FC.
-rw-r--r--authors.txt1
-rw-r--r--mesonbuild/environment.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/authors.txt b/authors.txt
index 91473a13b..72df2c27e 100644
--- a/authors.txt
+++ b/authors.txt
@@ -82,3 +82,4 @@ Richard Hughes
Rafael Fontenelle
Michael Olbrich
Ernestas Kulik
+Thomas Hindoe Paaboel Andersen
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 3152d5d2a..d3be926d9 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -271,7 +271,7 @@ class Environment:
self.default_cpp = ['c++']
self.default_objc = ['cc']
self.default_objcpp = ['c++']
- self.default_fortran = ['gfortran', 'g95', 'f95', 'f90', 'f77']
+ self.default_fortran = ['gfortran', 'g95', 'f95', 'f90', 'f77', 'ifort']
self.default_static_linker = ['ar']
self.vs_static_linker = ['lib']
self.gcc_static_linker = ['gcc-ar']