aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-11-02 23:35:38 +0200
committerGitHub <noreply@github.com>2019-11-02 23:35:38 +0200
commitf5c88932810ded5ea3d4a2f4a8f0350635c3c44a (patch)
tree5ac2d4465b2298c2d78dd2715367f36561977800 /mesonbuild/compilers
parentbbe6db08e39179191f60e397b8837b5a685760d1 (diff)
parent50225c14e23c51cc9d389488b85768d8c72215c0 (diff)
downloadmeson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.zip
meson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.tar.gz
meson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.tar.bz2
Merge pull request #6123 from scivision/bugfix-fortran
bugfix: fortran compiler assertionerror from 0c22798
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/fortran.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index 57700f9..0d94297 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -317,7 +317,7 @@ class PathScaleFortranCompiler(FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs):
- FortranCompiler.__init__(self, exelist, for_machine, version,
+ FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs)
self.id = 'pathscale'
default_warn_args = ['-fullwarn']
@@ -334,7 +334,7 @@ class PGIFortranCompiler(PGICompiler, FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs):
- FortranCompiler.__init__(self, exelist, for_machine, version,
+ FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs)
PGICompiler.__init__(self)
@@ -346,7 +346,7 @@ class FlangFortranCompiler(ClangCompiler, FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs):
- FortranCompiler.__init__(self, exelist, for_machine, version,
+ FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs)
ClangCompiler.__init__(self)
self.id = 'flang'
@@ -363,7 +363,7 @@ class Open64FortranCompiler(FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs):
- FortranCompiler.__init__(self, exelist, for_machine, version,
+ FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs)
self.id = 'open64'
default_warn_args = ['-fullwarn']
@@ -380,7 +380,7 @@ class NAGFortranCompiler(FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs):
- FortranCompiler.__init__(self, exelist, for_machine, version,
+ FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs)
self.id = 'nagfor'