From 1fb8e744ddf2879c70995e10a873dccd2cfd2fb0 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 21 Mar 2019 07:46:03 -0600 Subject: [PATCH] makefile: build distro packages as machine-independent by default --- INSTALL.txt | 14 +++++--------- Makefile | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index 940659eb98..d103291961 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -374,15 +374,11 @@ for the client in the site configuration, and is platform-specific: ".sh" for Unix (including Linux), ".dmg" or ".pkg" for Mac OS, and ".exe" for Windows. -When building clients with variant 'cs, you can speed up the build -process by using `SERVER_COMPILE_MACHINE=-M` with `make installers`. -That mode causes the server to send built packages to clients in -machine-independent form, which will need to be recompiled to the -client's native format for bytecode, but recompiling from -machine-independent form can be much faster than compiling from -source. Beware that `SERVER_COMPILE_MACHINE=-M`cannot be used in -a respository checkout formerly used without it, unless you first -run `raco setup --clean`. +The server supports both 'cs and '3m clients by creating built +packages in machine-independent form (which is then recompiled to the +client's native format, still much faster than compiling from source). +Set `SERVER_COMPILE_MACHINE=` to disable machine-independent format +for built packages. Generating Installer Web Sites ------------------------------ diff --git a/Makefile b/Makefile index 42796733b7..dd7ad23478 100644 --- a/Makefile +++ b/Makefile @@ -655,7 +655,7 @@ win32-pkgs-catalog: # ------------------------------------------------------------ # Handle `SERVER_COMPILE_MACHINE` for various targets -SERVER_COMPILE_MACHINE = +SERVER_COMPILE_MACHINE = -M ANY_COMPILE_MACHINE_ARGS_qq = SETUP_MACHINE_FLAGS="-MCR `pwd`/build/zo:" \ MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --enable-crossany"