From 9c1bab67afad3933a08b24a846a7e0d255ccb5e2 Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Thu, 31 Oct 2019 23:22:37 -0400 Subject: bugfix: fortran compiler assertionerror from 0c22798 --- mesonbuild/compilers/fortran.py | 10 +++++----- mesonbuild/environment.py | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index 57700f922..0d9429785 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 99428c7cb..b7629c8d3 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1151,8 +1151,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: -- cgit v1.3 From 50225c14e23c51cc9d389488b85768d8c72215c0 Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Thu, 31 Oct 2019 23:53:47 -0400 Subject: fix PGI Windows 'ar' linker --- mesonbuild/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index b7629c8d3..1d026b090 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1504,7 +1504,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 = {} -- cgit v1.3