diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-05 21:44:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-05 21:44:31 +0200 |
| commit | 1aca899a63ef287c6fb06e5383f6355b5e75d6d2 (patch) | |
| tree | c0a77585ae3dbb716b5b51557486ffc25ef4dadf /mesonbuild/modules/gnome.py | |
| parent | 26437f0297bd9dcf4411d4591679724d59e1c312 (diff) | |
| parent | e147054d6f8b78b306125fd785603ca0519fdfc1 (diff) | |
| download | meson-1aca899a63ef287c6fb06e5383f6355b5e75d6d2.zip meson-1aca899a63ef287c6fb06e5383f6355b5e75d6d2.tar.gz meson-1aca899a63ef287c6fb06e5383f6355b5e75d6d2.tar.bz2 | |
Merge pull request #4445 from Ericson2314/no-cross_info
Parsing of cross file upfront, and store in cross-agnostic data structures
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')) |