diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-02-16 18:56:01 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-02-16 18:56:01 +0200 |
| commit | 04587bfaf1b3e098e2725d42ad1df15ffa79ea42 (patch) | |
| tree | 4d3ebbb1fc689e954b527e65076e0908c9e5e329 /mesonbuild/environment.py | |
| parent | 3ed30cea6ed754fa9f519f15d8e322b8fcc2126b (diff) | |
| download | meson-regrfix.zip meson-regrfix.tar.gz meson-regrfix.tar.bz2 | |
Non-working fix and test. Closes #8361.regrfix
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index b12728b..7bcdfea 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -823,11 +823,20 @@ class Environment: for lang in compilers.compilers.LANGUAGES_USING_CPPFLAGS: key = key.evolve(lang=lang) v = mesonlib.listify(self.options.get(key, [])) - self.options.setdefault(key, v + p_list) + if self.is_cross_build(): + # Only "build." options come from environment variables. + if key.machine is MachineChoice.BUILD: + self.options.setdefault(key, v + p_list) + else: + self.options[key] = v + p_list else: key = OptionKey.from_string(keyname).evolve(machine=for_machine) v = mesonlib.listify(self.options.get(key, [])) - self.options.setdefault(key, v + p_list) + if self.is_cross_build(): + if key.machine is MachineChoice.BUILD: + self.options.setdefault(key, v + p_list) + else: + self.options[key] = v + p_list def _set_default_binaries_from_env(self) -> None: """Set default binaries from the environment. |