From d5a46eb39d37906771f01dad24c99f88e2cd5757 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 9 May 2019 16:50:15 -0600
Subject: [PATCH] cs: repair build without `--enable-racket`

When using a built-for-bootstrapping Racket to build Racket CS, the
intermediate module loading module mode should be `--boot` instead of
`--chain`. The repo's top-level makefile takes care of that already,
but not `configure`-generated makefiles as may happen in a build from
a source distribution.
---
 racket/src/cs/c/Makefile.in  | 2 +-
 racket/src/cs/c/configure    | 4 ++++
 racket/src/cs/c/configure.ac | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in
index 8d5d1725c6..fcea185cc9 100644
--- a/racket/src/cs/c/Makefile.in
+++ b/racket/src/cs/c/Makefile.in
@@ -60,7 +60,7 @@ cs:
 	$(MAKE) gracketcs
 	$(MAKE) starter
 
-SETUP_BOOT_MODE = --chain
+SETUP_BOOT_MODE = @SETUP_BOOT_MODE@
 SETUP_COMMON_BOOT = -l- setup $(SETUP_BOOT_MODE) $(srcdir)/../../setup-go.rkt $(builddir)/compiled
 
 ABS_BOOT = $(SETUP_COMMON_BOOT) ignored $(builddir)/ignored.d
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 5cb6b87d4c..2a2800492a 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -643,6 +643,7 @@ NOT_MINGW
 MINGW
 NOT_OSX
 OSX
+SETUP_BOOT_MODE
 TT_CROSS_MODE
 T_CROSS_MODE
 CROSS_MODE
@@ -2814,6 +2815,7 @@ FRAMEWORK_PREFIX='@executable_path/../lib/'
 
 RACKET='$(DEFAULT_RACKET)'
 RUN_RACKET='$(RUN_THIS_RACKET)'
+SETUP_BOOT_MODE=--boot
 
 INSTALL_SETUP_FLAGS=
 INSTALL_SETUP_RACKET_FLAGS=
@@ -4135,6 +4137,7 @@ fi
 
 if test "${enable_racket}" != "" ; then
   RACKET="${enable_racket}"
+  SETUP_BOOT_MODE=--chain
 fi
 
 SCHEME_CONFIG_ARGS="--machine=${MACH} --disable-x11 ${disable_curses_arg} ${extra_scheme_config_args}"
@@ -4979,6 +4982,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
 
 
 
+
 
 
 makefiles="Makefile"
diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac
index ddb599970e..bb14943b6f 100644
--- a/racket/src/cs/c/configure.ac
+++ b/racket/src/cs/c/configure.ac
@@ -125,6 +125,7 @@ FRAMEWORK_PREFIX='@executable_path/../lib/'
 
 RACKET='$(DEFAULT_RACKET)'
 RUN_RACKET='$(RUN_THIS_RACKET)'
+SETUP_BOOT_MODE=--boot
 
 INSTALL_SETUP_FLAGS=
 INSTALL_SETUP_RACKET_FLAGS=
@@ -387,6 +388,7 @@ fi
 
 if test "${enable_racket}" != "" ; then
   RACKET="${enable_racket}"
+  SETUP_BOOT_MODE=--chain
 fi
 
 SCHEME_CONFIG_ARGS="--machine=${MACH} --disable-x11 ${disable_curses_arg} ${extra_scheme_config_args}"
@@ -609,6 +611,7 @@ AC_SUBST(DIFF_MACH)
 AC_SUBST(CROSS_MODE)
 AC_SUBST(T_CROSS_MODE)
 AC_SUBST(TT_CROSS_MODE)
+AC_SUBST(SETUP_BOOT_MODE)
 AC_SUBST(OSX)
 AC_SUBST(NOT_OSX)
 AC_SUBST(MINGW)