aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-25 12:13:56 +0100
committerRoss Burton <ross.burton@intel.com>2018-09-28 17:18:24 +0100
commitfe981b0231e6ad26633277f2b656e886ffd1ea7a (patch)
tree80699765261992a88b2e574a35ddc21c32cc3842
parent47d115f6a87654e393b2e8c5ccf485e862250860 (diff)
downloadmeson-fe981b0231e6ad26633277f2b656e886ffd1ea7a.zip
meson-fe981b0231e6ad26633277f2b656e886ffd1ea7a.tar.gz
meson-fe981b0231e6ad26633277f2b656e886ffd1ea7a.tar.bz2
gnome: use target c_args/c_link_args for g-ir-scanner when cross-compiling
When cross-compiling we shouldn't be passing the native c_args/c_link_args to g-ir-scanner.
-rw-r--r--mesonbuild/modules/gnome.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index a7452a4..45b7eed 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -518,7 +518,12 @@ class GnomeModule(ExtensionModule):
ret = []
for lang in langs:
- for link_arg in state.environment.coredata.get_external_link_args(lang):
+ if state.environment.is_cross_build():
+ link_args = state.environment.cross_info.config["properties"].get(lang + '_link_args', "")
+ else:
+ link_args = state.environment.coredata.get_external_link_args(lang)
+
+ for link_arg in link_args:
if link_arg.startswith('-L'):
ret.append(link_arg)
@@ -691,7 +696,10 @@ class GnomeModule(ExtensionModule):
def _get_external_args_for_langs(self, state, langs):
ret = []
for lang in langs:
- ret += state.environment.coredata.get_external_args(lang)
+ if state.environment.is_cross_build():
+ ret += state.environment.cross_info.config["properties"].get(lang + '_args', "")
+ else:
+ ret += state.environment.coredata.get_external_args(lang)
return ret
@staticmethod