diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-11-02 23:35:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-02 23:35:38 +0200 |
| commit | f5c88932810ded5ea3d4a2f4a8f0350635c3c44a (patch) | |
| tree | 5ac2d4465b2298c2d78dd2715367f36561977800 | |
| parent | bbe6db08e39179191f60e397b8837b5a685760d1 (diff) | |
| parent | 50225c14e23c51cc9d389488b85768d8c72215c0 (diff) | |
| download | meson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.zip meson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.tar.gz meson-f5c88932810ded5ea3d4a2f4a8f0350635c3c44a.tar.bz2 | |
Merge pull request #6123 from scivision/bugfix-fortran
bugfix: fortran compiler assertionerror from 0c22798
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 10 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 5 |
2 files changed, 7 insertions, 8 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' diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index a1b46a8..fccca16 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1155,8 +1155,7 @@ class Environment: 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: @@ -1509,7 +1508,7 @@ class Environment: # Intel has it's own linker that acts like microsoft's lib linkers = ['xilib'] elif isinstance(compiler, (PGICCompiler, PGIFortranCompiler)) and mesonlib.is_windows(): - linkers = [self.default_static_linker] # this is just a wrapper calling link/lib on Windows, keeping things simple. + linkers = [['ar']] # For PGI on Windows, "ar" is just a wrapper calling link/lib. else: linkers = defaults popen_exceptions = {} |