diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-09 16:06:55 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-01-02 16:22:47 -0500 |
| commit | 2b22576fb6a8bb52434068d95eff188a201e6bc5 (patch) | |
| tree | b169c0c8c5cf56f68cf8a1d75f35a0fb71ad295f /mesonbuild/modules/gnome.py | |
| parent | dbf080afe99a8bbb04a3bfb19a81363d3b78e7b4 (diff) | |
| download | meson-2b22576fb6a8bb52434068d95eff188a201e6bc5.zip meson-2b22576fb6a8bb52434068d95eff188a201e6bc5.tar.gz meson-2b22576fb6a8bb52434068d95eff188a201e6bc5.tar.bz2 | |
Remove cross_info; cross file is parsed up front and discarded
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index be99059..2ab575c 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -532,7 +532,7 @@ class GnomeModule(ExtensionModule): for lang in langs: if state.environment.is_cross_build(): - link_args = state.environment.cross_info.config["properties"].get(lang + '_link_args', "") + link_args = state.environment.properties.host.get_external_link_args(lang) else: link_args = state.environment.coredata.get_external_link_args(lang) @@ -715,7 +715,7 @@ class GnomeModule(ExtensionModule): ret = [] for lang in langs: if state.environment.is_cross_build(): - ret += state.environment.cross_info.config["properties"].get(lang + '_args', "") + ret += state.environment.properties.host.get_external_args(lang) else: ret += state.environment.coredata.get_external_args(lang) return ret @@ -1043,8 +1043,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', "")) + cflags.update(state.environment.properties.host.get_external_args('c')) + ldflags.update(state.environment.properties.host.get_external_link_args('c')) compiler = state.environment.coredata.cross_compilers.get('c') else: cflags.update(state.environment.coredata.get_external_args('c')) |