diff --git a/build.md b/build.md index 0c02ba02fe..1b95ea6b6a 100644 --- a/build.md +++ b/build.md @@ -233,7 +233,7 @@ downloaded from a separate Git repository by `make`. If you have Racket v7.1 or later, then you can choose instead to bootstrap using that Racket implementation with -  `make cs RACKET=racket` +  `make cs RACKET_FOR_BOOTFILES=racket` The `make bc` target (or `make bc-as-is` for a rebuild, or `nmake win-bc` on Windows with Visual Studio) builds an older variant of diff --git a/pkgs/racket-build-guide/build.scrbl b/pkgs/racket-build-guide/build.scrbl index 9db7842990..5588538899 100644 --- a/pkgs/racket-build-guide/build.scrbl +++ b/pkgs/racket-build-guide/build.scrbl @@ -211,7 +211,7 @@ downloaded from a separate Git repository by @exec{make}. If you have Racket v7.1 or later, then you can choose instead to bootstrap using that Racket implementation with -@commandline{make cs RACKET=racket} +@commandline{make cs RACKET_FOR_BOOTFILES=racket} The @exec{make bc} target (or @exec{make bc-as-is} for a rebuild, or @exec{nmake win-bc} on Windows with Visual Studio) builds an older diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in index 2ffa00dfb1..2abbe1e915 100644 --- a/racket/src/cs/c/Makefile.in +++ b/racket/src/cs/c/Makefile.in @@ -50,6 +50,10 @@ DEFAULT_RACKET = ./raw_racketcs RACKET = @RACKET@ BOOTFILE_RACKET = @BOOTFILE_RACKET@ +# Potentially supplied by makefile that calls this one, and +# overrides `BOOTFILE_RACKET` if non-empty: +RACKET_FOR_BOOTFILES = + CS_INSTALLED = @CS_INSTALLED@ NOOP = : @@ -124,7 +128,9 @@ bounce: scheme: mkdir -p $(SCHEME_WORKAREA) - if [ "$(BOOTFILE_RACKET)" != "$(DEFAULT_RACKET)" ] ; \ + if [ "$(RACKET_FOR_BOOTFILES)" != "" ] ; \ + then $(MAKE) scheme-via-rktboot BOOTFILE_RACKET="$(RACKET_FOR_BOOTFILES)" SETUP_BOOT_MODE=--chain ; \ + elif [ "$(BOOTFILE_RACKET)" != "$(DEFAULT_RACKET)" ] ; \ then $(MAKE) scheme-via-rktboot BOOTFILE_RACKET="$(BOOTFILE_RACKET)" ; \ else $(MAKE) scheme-via-pb ; fi