mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-21 05:25:38 +00:00
c6acf50360
https://github.com/mesonbuild/meson/compare/0.55.0...0.55.1 setuptools have been removed from runtime dependencies: https://github.com/mesonbuild/meson/pull/7461
14 lines
615 B
Diff
14 lines
615 B
Diff
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
|
|
index 219b62ec8..e3ceaddbd 100644
|
|
--- a/mesonbuild/envconfig.py
|
|
+++ b/mesonbuild/envconfig.py
|
|
@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice,
|
|
# compiling we fall back on the unprefixed host version. This
|
|
# allows native builds to never need to worry about the 'BUILD_*'
|
|
# ones.
|
|
- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]),
|
|
+ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]),
|
|
# Always just the unprefixed host verions
|
|
[var_name]
|
|
)[for_machine]
|