gnome: use CompilerArgs for linker args

This properly constructs the linker groups necessary for linking
static libraries.
pull/14257/head
Alyssa Ross 3 weeks ago
parent 8783dc888b
commit 998f2adbd8
No known key found for this signature in database
GPG Key ID: 5B459184230FF0A2
  1. 7
      mesonbuild/modules/gnome.py

@ -1562,15 +1562,16 @@ class GnomeModule(ExtensionModule):
deps_cflags, internal_ldflags, external_ldflags, _gi_includes, new_depends = \ deps_cflags, internal_ldflags, external_ldflags, _gi_includes, new_depends = \
self._get_dependencies_flags(deps, state, depends, include_rpath=True) self._get_dependencies_flags(deps, state, depends, include_rpath=True)
compiler = state.environment.coredata.compilers[MachineChoice.HOST]['c']
cflags.extend(deps_cflags) cflags.extend(deps_cflags)
cflags.extend(state.get_include_args(inc_dirs)) cflags.extend(state.get_include_args(inc_dirs))
ldflags: T.List[str] = [] ldflags = compiler.compiler_args()
ldflags.extend(internal_ldflags) ldflags.extend(internal_ldflags)
ldflags.extend(external_ldflags) ldflags.extend(external_ldflags)
cflags.extend(state.environment.coredata.get_external_args(MachineChoice.HOST, 'c')) cflags.extend(state.environment.coredata.get_external_args(MachineChoice.HOST, 'c'))
ldflags.extend(state.environment.coredata.get_external_link_args(MachineChoice.HOST, 'c')) ldflags.extend(state.environment.coredata.get_external_link_args(MachineChoice.HOST, 'c'))
compiler = state.environment.coredata.compilers[MachineChoice.HOST]['c']
compiler_flags = self._get_langs_compilers_flags(state, [('c', compiler)]) compiler_flags = self._get_langs_compilers_flags(state, [('c', compiler)])
cflags.extend(compiler_flags[0]) cflags.extend(compiler_flags[0])
@ -1582,7 +1583,7 @@ class GnomeModule(ExtensionModule):
if cflags: if cflags:
args += ['--cflags=%s' % join_args(cflags)] args += ['--cflags=%s' % join_args(cflags)]
if ldflags: if ldflags:
args += ['--ldflags=%s' % join_args(ldflags)] args += ['--ldflags=%s' % join_args(ldflags.to_native())]
return args, new_depends return args, new_depends

Loading…
Cancel
Save