diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2023-04-14 15:52:56 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-04-14 15:52:56 +0000 |
| commit | 11bdd6fcc42a7b49178338860a0807d3b7211c0d (patch) | |
| tree | 8f50f7130a76090ee5014e2d10e5d013966880d9 | |
| parent | d5a7982eeb5bc009fa3b9e527225bf2ba06bc9f9 (diff) | |
| parent | 004f48f4fc8adfccad51e2a7f4608c7fe3c28c7c (diff) | |
| download | glib-11bdd6fcc42a7b49178338860a0807d3b7211c0d.tar.gz | |
Merge branch 'wip/jtojnar/wl-are-compiler-flags' into 'main'
build/gmodule-2.0.pc: Move compiler flags from Libs to Cflags
See merge request GNOME/glib!3356
| -rw-r--r-- | gio/tests/meson.build | 2 | ||||
| -rw-r--r-- | gmodule/meson.build | 6 | ||||
| -rw-r--r-- | meson.build | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 2631b1285..2f312e056 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -767,7 +767,7 @@ if not meson.is_cross_build() resource_plugin += shared_module('resourceplugin', sources: ['resourceplugin.c', plugin_resources_c], - link_args : export_dynamic_ldflags, + c_args : export_dynamic_cflags, dependencies : common_gio_tests_deps, install_dir : installed_tests_execdir, install_tag : 'tests', diff --git a/gmodule/meson.build b/gmodule/meson.build index 4b0778e70..237992fcc 100644 --- a/gmodule/meson.build +++ b/gmodule/meson.build @@ -115,22 +115,24 @@ pkg.generate(libgmodule, description : 'Dynamic module loader for GLib', ) -pkg.generate(libraries : [libgmodule, export_dynamic_ldflags], +pkg.generate(libraries : [libgmodule], requires : ['glib-2.0'], version : glib_version, variables : [supported_var], install_dir : glib_pkgconfigreldir, filebase : 'gmodule-export-2.0', + extra_cflags : export_dynamic_cflags, name : 'GModule', description : 'Dynamic module loader for GLib', ) -pkg.generate(libraries : [libgmodule, export_dynamic_ldflags], +pkg.generate(libraries : [libgmodule], requires : ['glib-2.0'], version : glib_version, variables : [supported_var], install_dir : glib_pkgconfigreldir, filebase : 'gmodule-2.0', + extra_cflags : export_dynamic_cflags, name : 'GModule', description : 'Dynamic module loader for GLib', ) diff --git a/meson.build b/meson.build index dfb77723c..62334cea4 100644 --- a/meson.build +++ b/meson.build @@ -2305,15 +2305,15 @@ if host_system == 'windows' # Autotools explicitly removed --Wl,--export-all-symbols from windows builds, # with no explanation. Do the same here for now but this could be revisited if # if causes issues. - export_dynamic_ldflags = [] + export_dynamic_cflags = [] elif host_system == 'cygwin' - export_dynamic_ldflags = ['-Wl,--export-all-symbols'] + export_dynamic_cflags = ['-Wl,--export-all-symbols'] elif host_system in ['darwin', 'ios'] - export_dynamic_ldflags = [] + export_dynamic_cflags = [] elif host_system == 'sunos' - export_dynamic_ldflags = [] + export_dynamic_cflags = [] else - export_dynamic_ldflags = ['-Wl,--export-dynamic'] + export_dynamic_cflags = ['-Wl,--export-dynamic'] endif win32_cflags = [] |