aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py13
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.