aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-25 12:15:27 +0100
committerRoss Burton <ross.burton@intel.com>2018-09-28 17:18:24 +0100
commit47d115f6a87654e393b2e8c5ccf485e862250860 (patch)
treeef1f96f0d355409f55ba47e1888046e77011e9cf
parent1efcca637b70ad5e3f2bac035b7ebe497b18080a (diff)
downloadmeson-47d115f6a87654e393b2e8c5ccf485e862250860.zip
meson-47d115f6a87654e393b2e8c5ccf485e862250860.tar.gz
meson-47d115f6a87654e393b2e8c5ccf485e862250860.tar.bz2
gnome: add missing cflags/ldflags to gtk-doc when cross-compiling
When cross-compiling the gtk-doc calls were missing the configured c_args and c_link_args.
-rw-r--r--mesonbuild/modules/gnome.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 5128de4..a7452a4 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -1012,6 +1012,8 @@ This will become a hard error in the future.''')
ldflags.update(external_ldflags)
if state.environment.is_cross_build():
+ cflags.update(state.environment.cross_info.config["properties"].get('c_args', ""))
+ ldflags.update(state.environment.cross_info.config["properties"].get('c_link_args', ""))
compiler = state.environment.coredata.cross_compilers.get('c')
else:
cflags.update(state.environment.coredata.get_external_args('c'))