From 7eb0b8534d1fa4f2481bf226fa7c1415f776e294 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 6 Feb 2020 12:40:05 -0700 Subject: [PATCH] improve makefile's bundle target Use `--no-user` for the `raco setup` that is supposed to finish a bundle. Otherwise, things installed in user scope for the same Racket version (i.e., the one being bundled) can interfere with the bundling process. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8aeec64ba8..5e14ead4fc 100644 --- a/Makefile +++ b/Makefile @@ -870,7 +870,7 @@ bundle-from-server: $(USER_RACKET) -l setup/winstrip bundle/racket $(USER_RACKET) -l setup/winvers-change bundle/racket $(USER_RACKET) -l- distro-build/unpack-collects $(UNPACK_COLLECTS_FLAGS) http://$(SVR_PRT)/$(SERVER_COLLECTS_PATH) - $(IN_BUNDLE_RACO) setup $(JOB_OPTIONS) $(RECOMPILE_OPTIONS) + $(IN_BUNDLE_RACO) setup --no-user $(JOB_OPTIONS) $(RECOMPILE_OPTIONS) $(IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS) $(IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS) $(USER_RACKET) -l setup/unixstyle-install post-adjust "$(SOURCE_MODE)" "$(PKG_SOURCE_MODE)" racket bundle/racket @@ -908,7 +908,7 @@ win32-bundle: win32-bundle-from-server: $(MAKE) win32-bundle $(COPY_ARGS) $(WIN32_RACKET) -l- distro-build/unpack-collects $(UNPACK_COLLECTS_FLAGS) http://$(SVR_PRT)/$(SERVER_COLLECTS_PATH) - $(WIN32_IN_BUNDLE_RACO) setup -l racket/base + $(WIN32_IN_BUNDLE_RACO) setup --no-user -l racket/base $(WIN32_IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS) $(WIN32_IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS)