From ba6e1754eb5686fc77e0b7caa9daba2d1cdfaa34 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 4 Sep 2013 06:55:56 -0600 Subject: [PATCH] make catalog-based installer build work A catalog-based installer build (as opposed to an installer build that uses "pkgs" and "native-pkgs") relies on the new `--all-platforms` package-install flag and related support for re-packing installed platform-specific packages. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e600a4e81d..46c40bcfeb 100644 --- a/Makefile +++ b/Makefile @@ -320,9 +320,9 @@ packages-from-local: # `SRC_CATALOG': build-from-catalog: $(MAKE) fresh-user - $(RACO) pkg install $(SOURCE_USER_AUTO_q) $(REQUIRED_PKGS) $(DISTRO_BUILD_PKGS) + $(RACO) pkg install --all-platforms $(SOURCE_USER_AUTO_q) $(REQUIRED_PKGS) $(DISTRO_BUILD_PKGS) $(MAKE) set-config - $(RACKET) -l distro-build/install-pkgs $(CONFIG_MODE_q) "$(PKGS)" $(SOURCE_USER_AUTO_q) + $(RACKET) -l distro-build/install-pkgs $(CONFIG_MODE_q) "$(PKGS)" $(SOURCE_USER_AUTO_q) --all-platforms $(RACO) setup --avoid-main $(JOB_OPTIONS) # Although a client will build its own "collects", pack up the