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

Hoist gen_vs_module_defs_args from Gnu to GnuLike. 

Support vs_module_defs when cross-compiling to Windows with clang.

Fixes #4434.
This commit is contained in:
Josh Gao 2018-10-27 22:08:06 -07:00 committed by Jussi Pakkanen
parent edda80cc75
commit beb1f00f3b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mesonbuild/compilers/compilers.py
View File

@ -1439,6 +1439,16 @@ class GnuLikeCompiler(abc.ABC):
def gnu_symbol_visibility_args(self, vistype): def gnu_symbol_visibility_args(self, vistype):
return gnu_symbol_visibility_args[vistype] return gnu_symbol_visibility_args[vistype]
def gen_vs_module_defs_args(self, defsfile):
if not isinstance(defsfile, str):
raise RuntimeError('Module definitions file should be str')
# On Windows targets, .def files may be specified on the linker command
# line like an object file.
if self.compiler_type.is_windows_compiler:
return [defsfile]
# For other targets, discard the .def file.
return []
class GnuCompiler(GnuLikeCompiler): class GnuCompiler(GnuLikeCompiler):
""" """
@ -1477,16 +1487,6 @@ class GnuCompiler(GnuLikeCompiler):
def get_pch_suffix(self): def get_pch_suffix(self):
return 'gch' return 'gch'
def gen_vs_module_defs_args(self, defsfile):
if not isinstance(defsfile, str):
raise RuntimeError('Module definitions file should be str')
# On Windows targets, .def files may be specified on the linker command
# line like an object file.
if self.compiler_type.is_windows_compiler:
return [defsfile]
# For other targets, discard the .def file.
return []
def get_gui_app_args(self, value): def get_gui_app_args(self, value):
if self.compiler_type.is_windows_compiler and value: if self.compiler_type.is_windows_compiler and value:
return ['-mwindows'] return ['-mwindows']