From f4a08af16b8d77ce52c5d749f2e8d01b99db3baa Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 24 Nov 2018 13:59:56 -0700 Subject: [PATCH] makefile: add setup step after unpack-collects When unpacking a "collects" tree that is compiled in machine-independent mode, an extra `raco setup` is needed before `raco pkg`. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 485d4ad44d..2d711a2034 100644 --- a/Makefile +++ b/Makefile @@ -724,7 +724,8 @@ distro-build-from-server: # Copy our local build into a "bundle/racket" build, dropping in the # process things that should not be in an installer (such as the "src" # directory). Then, replace the "collects" tree with the one from the -# server. Install required packages next, because they may include +# server. Run `raco setup` in case the replacing "collects" tree needs +# recompiling. Install required packages next, because they may include # packages that are needed to make core functionality work right # (which as the SQLite3 library). At last, install the selected packages # from the server, and the run a post-adjustment script. @@ -735,6 +736,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 -l racket/base $(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 @@ -769,6 +771,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) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS) $(WIN32_IN_BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS)