suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cs: repair build without --enable-racket

Browse Source 
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.
This commit is contained in:
Matthew Flatt 2019-05-09 16:50:15 -06:00
parent 8ade5f94c6
commit d5a46eb39d
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
racket/src/cs/c/Makefile.in
View File

@ -60,7 +60,7 @@ cs:
$(MAKE) gracketcs $(MAKE) gracketcs
$(MAKE) starter $(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 SETUP_COMMON_BOOT = -l- setup $(SETUP_BOOT_MODE) $(srcdir)/../../setup-go.rkt $(builddir)/compiled
ABS_BOOT = $(SETUP_COMMON_BOOT) ignored $(builddir)/ignored.d ABS_BOOT = $(SETUP_COMMON_BOOT) ignored $(builddir)/ignored.d

4
racket/src/cs/c/configure vendored
View File

@ -643,6 +643,7 @@ NOT_MINGW
MINGW MINGW
NOT_OSX NOT_OSX
OSX OSX
SETUP_BOOT_MODE
TT_CROSS_MODE TT_CROSS_MODE
T_CROSS_MODE T_CROSS_MODE
CROSS_MODE CROSS_MODE
@ -2814,6 +2815,7 @@ FRAMEWORK_PREFIX='@executable_path/../lib/'
RACKET='$(DEFAULT_RACKET)' RACKET='$(DEFAULT_RACKET)'
RUN_RACKET='$(RUN_THIS_RACKET)' RUN_RACKET='$(RUN_THIS_RACKET)'
SETUP_BOOT_MODE=--boot
INSTALL_SETUP_FLAGS= INSTALL_SETUP_FLAGS=
INSTALL_SETUP_RACKET_FLAGS= INSTALL_SETUP_RACKET_FLAGS=
@ -4135,6 +4137,7 @@ fi
if test "${enable_racket}" != "" ; then if test "${enable_racket}" != "" ; then
RACKET="${enable_racket}" RACKET="${enable_racket}"
SETUP_BOOT_MODE=--chain
fi fi
SCHEME_CONFIG_ARGS="--machine=${MACH} --disable-x11 ${disable_curses_arg} ${extra_scheme_config_args}" SCHEME_CONFIG_ARGS="--machine=${MACH} --disable-x11 ${disable_curses_arg} ${extra_scheme_config_args}"
@ -4979,6 +4982,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
makefiles="Makefile" makefiles="Makefile"

3
racket/src/cs/c/configure.ac
View File

@ -125,6 +125,7 @@ FRAMEWORK_PREFIX='@executable_path/../lib/'
RACKET='$(DEFAULT_RACKET)' RACKET='$(DEFAULT_RACKET)'
RUN_RACKET='$(RUN_THIS_RACKET)' RUN_RACKET='$(RUN_THIS_RACKET)'
SETUP_BOOT_MODE=--boot
INSTALL_SETUP_FLAGS= INSTALL_SETUP_FLAGS=
INSTALL_SETUP_RACKET_FLAGS= INSTALL_SETUP_RACKET_FLAGS=
@ -387,6 +388,7 @@ fi
if test "${enable_racket}" != "" ; then if test "${enable_racket}" != "" ; then
RACKET="${enable_racket}" RACKET="${enable_racket}"
SETUP_BOOT_MODE=--chain
fi fi
SCHEME_CONFIG_ARGS="--machine=${MACH} --disable-x11 ${disable_curses_arg} ${extra_scheme_config_args}" 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(CROSS_MODE)
AC_SUBST(T_CROSS_MODE) AC_SUBST(T_CROSS_MODE)
AC_SUBST(TT_CROSS_MODE) AC_SUBST(TT_CROSS_MODE)
AC_SUBST(SETUP_BOOT_MODE)
AC_SUBST(OSX) AC_SUBST(OSX)
AC_SUBST(NOT_OSX) AC_SUBST(NOT_OSX)
AC_SUBST(MINGW) AC_SUBST(MINGW)