From 722d4858aa721d335da0bb7794be0d337c9677b6 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 24 Sep 2014 20:04:22 -0600 Subject: [PATCH] make installer: prevent pollution from local to catalog-based build --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6757f2a985..2f5e37c2ec 100644 --- a/Makefile +++ b/Makefile @@ -422,6 +422,7 @@ build-from-catalog: $(RACKET) -l- distro-build/pkg-info -o build/pkgs.rktd build/catalog-copy $(RACKET) -l distro-build/install-pkgs $(CONFIG_MODE_q) "$(PKGS)" $(SOURCE_USER_AUTO_q) --all-platforms $(RACO) setup --avoid-main $(JOB_OPTIONS) + rm -rf build/native # Although a client will build its own "collects", pack up the # server's version to be used by each client, so that every client has @@ -431,12 +432,14 @@ origin-collects: $(RACKET) -l distro-build/pack-collects # Now that we've built packages from local sources, create "built" -# versions of the packages from the installation into "build/user": +# versions of the packages from the installation into "build/user"; +# packages that exist in "build/native" are not repacked: built-catalog: $(RACKET) -l distro-build/pack-built build/pkgs.rktd # Run a catalog server to provide pre-built packages, as well -# as the copy of the server's "collects" tree: +# as the copy of the server's "collects" tree; also serves +# the "build/native" directory, if it exists: built-catalog-server: if [ -d ".git" ]; then git update-server-info ; fi $(RACKET) -l distro-build/serve-catalog $(CONFIG_MODE_q) "$(SERVER_HOSTS)" $(SERVER_PORT) $(SERVE_DURING_CMD_qq)