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/compilers | |
| 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/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): |