Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix: fortran compiler assertionerror from 0c22798

This commit is contained in:
Michael Hirsch, Ph.D 2019-10-31 23:22:37 -04:00
parent 025e11c9a7
commit 9c1bab67af
No known key found for this signature in database
GPG Key ID: 6D23CDADAB0294F9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mesonbuild/compilers/fortran.py
View File

@ -317,7 +317,7 @@ class PathScaleFortranCompiler(FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice, def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None, is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs): **kwargs):
FortranCompiler.__init__(self, exelist, for_machine, version, FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs) is_cross, info, exe_wrapper, **kwargs)
self.id = 'pathscale' self.id = 'pathscale'
default_warn_args = ['-fullwarn'] default_warn_args = ['-fullwarn']
@ -334,7 +334,7 @@ class PGIFortranCompiler(PGICompiler, FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice, def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None, is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs): **kwargs):
FortranCompiler.__init__(self, exelist, for_machine, version, FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs) is_cross, info, exe_wrapper, **kwargs)
PGICompiler.__init__(self) PGICompiler.__init__(self)
@ -346,7 +346,7 @@ class FlangFortranCompiler(ClangCompiler, FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice, def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None, is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs): **kwargs):
FortranCompiler.__init__(self, exelist, for_machine, version, FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs) is_cross, info, exe_wrapper, **kwargs)
ClangCompiler.__init__(self) ClangCompiler.__init__(self)
self.id = 'flang' self.id = 'flang'
@ -363,7 +363,7 @@ class Open64FortranCompiler(FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice, def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None, is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs): **kwargs):
FortranCompiler.__init__(self, exelist, for_machine, version, FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs) is_cross, info, exe_wrapper, **kwargs)
self.id = 'open64' self.id = 'open64'
default_warn_args = ['-fullwarn'] default_warn_args = ['-fullwarn']
@ -380,7 +380,7 @@ class NAGFortranCompiler(FortranCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice, def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None, is_cross, info: 'MachineInfo', exe_wrapper=None,
**kwargs): **kwargs):
FortranCompiler.__init__(self, exelist, for_machine, version, FortranCompiler.__init__(self, exelist, version, for_machine,
is_cross, info, exe_wrapper, **kwargs) is_cross, info, exe_wrapper, **kwargs)
self.id = 'nagfor' self.id = 'nagfor'

3
mesonbuild/environment.py
View File

@ -1151,8 +1151,7 @@ class Environment:
compiler, for_machine, 'pgi', compiler, for_machine, 'pgi',
PGIFortranCompiler.LINKER_PREFIX, version=version) PGIFortranCompiler.LINKER_PREFIX, version=version)
return PGIFortranCompiler( return PGIFortranCompiler(
compiler, version, for_machine, is_cross, compiler, version, for_machine, is_cross, info, exe_wrap,
self.machines[for_machine], exe_wrap,
full_version=full_version, linker=linker) full_version=full_version, linker=linker)
if 'flang' in out or 'clang' in out: if 'flang' in out or 'clang' in out: