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/compilers | |
| 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/compilers')
| -rw-r--r-- | mesonbuild/compilers/c.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 46f4181..92a9fa6 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -757,7 +757,7 @@ class CCompiler(Compiler): varname = 'has function ' + funcname varname = varname.replace(' ', '_') if self.is_cross: - val = env.cross_info.config['properties'].get(varname, None) + val = env.properties.host.get(varname, None) if val is not None: if isinstance(val, bool): return val diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 31047b1..2be6ef1 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1045,13 +1045,10 @@ class Compiler: def get_cross_extra_flags(self, environment, link): extra_flags = [] if self.is_cross and environment: - if 'properties' in environment.cross_info.config: - props = environment.cross_info.config['properties'] - lang_args_key = self.language + '_args' - extra_flags += mesonlib.stringlistify(props.get(lang_args_key, [])) - lang_link_args_key = self.language + '_link_args' - if link: - extra_flags += mesonlib.stringlistify(props.get(lang_link_args_key, [])) + props = environment.properties.host + extra_flags += props.get_external_args(self.language) + if link: + extra_flags += props.get_external_link_args(self.language) return extra_flags def _get_compile_output(self, dirname, mode): |