From 0ac24baa877352337c2c75f2622d297fb991e204 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Wed, 7 Sep 2022 11:07:39 -0400 Subject: [PATCH] build-aux/Makefile.am (bootstrap-if-necessary): New target This introduces an order-only prerequisite `bootstrap-if-necessary` for the generation of `suppliers.mk`. Projects utilizing TAME as a dependency may include a `bootstrap.mk` that overrides this target to trigger any bootstrapping scripts that may be necessary due to toolchain updates. DEV-7145 --- build-aux/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am index 698736d4..c5deb902 100644 --- a/build-aux/Makefile.am +++ b/build-aux/Makefile.am @@ -275,11 +275,20 @@ clean: | sed 's/\.csvm$$/\.xml/; s/\.dat$$/\.xml/' \ | xargs rm -fv +# A target to be optionally overridden by `bootstrap.mk`. +.PHONY: bootstrap-if-necessary +bootstrap-if-necessary: FORCE + +# Targets intended to be run before the generation of `suppliers.mk`. +# This should be used to re-bootstrap the system if necessary +# (see `bootstrap-if-necessary` target). +-include bootstrap.mk + # Generates a Makefile that will properly build all package # dependencies. The redirect of ant to /dev/null is because it's still too # noisy even with -q---the "BUILD SUCCESSFUL" line is confusing, considering # it's merely a small part of a broader build. -suppliers.mk: $(src_suppliersmk) +suppliers.mk: $(src_suppliersmk) | bootstrap-if-necessary $(ant) -q pkg-dep >/dev/null find $(path_ui)/program/ -name '*.dep' | xargs cat $(path_ui)/program.dep | sort -u \ > $(path_ui)/package-dfns.dep