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

gfortran: Fix has_header implementation with GCC 10 

__has_include is not accepted as a pre-processor directive in Fortran
code since GCC 10.

Closes https://github.com/mesonbuild/meson/issues/7017
This commit is contained in:
Nirbheek Chauhan 2020-05-14 09:41:12 +05:30 committed by Nirbheek Chauhan
parent 57e55b1a9d
commit 37bade6f87
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mesonbuild/compilers/fortran.py
View File

@ -214,6 +214,18 @@ class GnuFortranCompiler(GnuCompiler, FortranCompiler):
def language_stdlib_only_link_flags(self) -> T.List[str]: def language_stdlib_only_link_flags(self) -> T.List[str]:
return ['-lgfortran', '-lm'] return ['-lgfortran', '-lm']
def has_header(self, hname, prefix, env, *, extra_args=None, dependencies=None, disable_cache=False):
'''
Derived from mixins/clike.py:has_header, but without C-style usage of
__has_include which breaks with GCC-Fortran 10:
https://github.com/mesonbuild/meson/issues/7017
'''
fargs = {'prefix': prefix, 'header': hname}
code = '{prefix}\n#include <{header}>'
return self.compiles(code.format(**fargs), env, extra_args=extra_args,
dependencies=dependencies, mode='preprocess', disable_cache=disable_cache)
class ElbrusFortranCompiler(GnuFortranCompiler, ElbrusCompiler): class ElbrusFortranCompiler(GnuFortranCompiler, ElbrusCompiler):
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,