Fix changes from #25857 that were accidentally reverted by #25188 #26660
Description
As I explained a bit here, #25857 ad #25188 had some interdependency, but were merged in the wrong order.
#25857 was merged for 8.5.beta1, then #25188 was merged in 8.5.beta2. However, the latter contained in it an old version of the former, which ended up taking precedence in the merge resolution.
This resulted in some changes being undone:
$ git diff 8.5.beta1..8.5.beta2 -- build/make/deps
diff --git a/build/make/deps b/build/make/deps
index a3abca3..bbe3277 100644
--- a/build/make/deps
+++ b/build/make/deps
@@ -75,15 +75,13 @@ toolchain: $(foreach pkgname,$(TOOLCHAIN),$(inst_$(pkgname)))
# unconditionally. We still use the dependency checking from $(MAKE),
# so this will not trigger useless rebuilds.
# See #14168 and #14232.
-#
-# Note: This list consists of only the *runtime* dependencies of the toolchain.
-TOOLCHAIN_DEPS = zlib $(MP_LIBRARY) mpfr mpc
-TOOLCHAIN_DEP_INSTS = \
- $(foreach pkgname,$(TOOLCHAIN_DEPS),$(inst_$(pkgname)))
-
+# Note: This list is determined from the dependencies of the TOOLCHAIN
+# packages which include gcc, and optionally ccache; in principle this
+# list is redundant.
+TOOLCHAIN_DEPS = zlib xz $(MP_LIBRARY) mpfr mpc
toolchain-deps:
- for target in $(TOOLCHAIN_DEP_INSTS); do \
- $(MAKE) $$target; \
+ for pkg in $(TOOLCHAIN_DEPS); do \
+ $(MAKE) $$pkg; \
done
all-toolchain: base-toolchainComponent: build
Author: Erik Bray
Branch/Commit: 8fec43d
Reviewer: Dima Pasechnik
Issue created by migration from https://trac.sagemath.org/ticket/26660