bugfix: fortran compiler assertionerror from 0c22798

lb90 · Nov 1, 2019 · 9c1bab6 · 9c1bab6
1 parent 025e11c
commit 9c1bab6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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'
 

diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
@@ -1151,8 +1151,7 @@ def detect_fortran_compiler(self, for_machine: MachineChoice):
                         compiler, for_machine, 'pgi',
                         PGIFortranCompiler.LINKER_PREFIX, version=version)
                     return PGIFortranCompiler(
-                        compiler, version, for_machine, is_cross,
-                        self.machines[for_machine], exe_wrap,
+                        compiler, version, for_machine, is_cross, info, exe_wrap,
                         full_version=full_version, linker=linker)
 
                 if 'flang' in out or 'clang' in out: