646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
13 lines
673 B
Diff
13 lines
673 B
Diff
diff -Naur meson-0.60.2-old/mesonbuild/environment.py meson-0.60.2-new/mesonbuild/environment.py
|
|
--- meson-0.60.2-old/mesonbuild/environment.py 2021-11-02 16:58:13.000000000 -0300
|
|
+++ meson-0.60.2-new/mesonbuild/environment.py 2021-12-12 17:44:00.350499307 -0300
|
|
@@ -68,7 +68,7 @@
|
|
# 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 versions
|
|
[var_name]
|
|
)[for_machine]
|