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

makefile: always make automatic checkout of Chez Scheme

Browse Source 
If `make cs` is run without specifying a SCHEME_SRC, then make sure
that `configure` and `make` are re-run in the Chez Scheme checkout,
in case it was updated.
This commit is contained in:
Matthew Flatt 2018-09-13 09:23:00 -06:00
parent 287157cc6d
commit 2a053caa1a
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -234,6 +234,7 @@ RACKET =
# Chez Scheme from `CHEZ_SCHEME_REPO` # Chez Scheme from `CHEZ_SCHEME_REPO`
SCHEME_SRC = SCHEME_SRC =
DEFAULT_SCHEME_SRC = racket/src/build/ChezScheme DEFAULT_SCHEME_SRC = racket/src/build/ChezScheme
MAKE_BUILD_SCHEME = y
CHEZ_SCHEME_REPO = https://github.com/mflatt/ChezScheme CHEZ_SCHEME_REPO = https://github.com/mflatt/ChezScheme
@ -289,14 +290,14 @@ ABS_SCHEME_SRC = "`$(RACKET) racket/src/cs/absify.rkt $(SCHEME_SRC)`"
cs-after-racket-with-racket: cs-after-racket-with-racket:
if [ "$(SCHEME_SRC)" = "" ] ; \ if [ "$(SCHEME_SRC)" = "" ] ; \
then $(MAKE) cs-after-racket-with-racket-and-scheme-src RACKET="$(RACKET)" SCHEME_SRC="$(DEFAULT_SCHEME_SRC)" ; \ then $(MAKE) cs-after-racket-with-racket-and-scheme-src RACKET="$(RACKET)" SCHEME_SRC="$(DEFAULT_SCHEME_SRC)" ; \
else $(MAKE) cs-after-racket-with-racket-and-scheme-src RACKET="$(RACKET)" SCHEME_SRC="$(SCHEME_SRC)" ; fi else $(MAKE) cs-after-racket-with-racket-and-scheme-src RACKET="$(RACKET)" SCHEME_SRC="$(SCHEME_SRC)" MAKE_BUILD_SCHEME=n ; fi
cs-after-racket-with-racket-and-scheme-src: cs-after-racket-with-racket-and-scheme-src:
$(MAKE) cs-after-racket-with-abs-paths RACKET="$(ABS_RACKET)" SCHEME_SRC="$(ABS_SCHEME_SRC)" SELF_UP=../ $(MAKE) cs-after-racket-with-abs-paths RACKET="$(ABS_RACKET)" SCHEME_SRC="$(ABS_SCHEME_SRC)" SELF_UP=../
cs-after-racket-with-abs-paths: cs-after-racket-with-abs-paths:
$(MAKE) racket/src/build/cs/Makefile $(MAKE) racket/src/build/cs/Makefile
cd racket/src/build/cs; $(MAKE) RACKET="$(RACKET)" SCHEME_SRC="$(SCHEME_SRC)" cd racket/src/build/cs; $(MAKE) RACKET="$(RACKET)" SCHEME_SRC="$(SCHEME_SRC)" MAKE_BUILD_SCHEME="$(MAKE_BUILD_SCHEME)"
$(MAKE) base-config $(MAKE) base-config
cd racket/src/build/cs; $(MAKE) install RACKET="$(RACKET)" $(INSTALL_SETUP_ARGS) cd racket/src/build/cs; $(MAKE) install RACKET="$(RACKET)" $(INSTALL_SETUP_ARGS)
$(MAKE) $(CS_SETUP_TARGET) PLAIN_RACKET=racket/bin/racketcs $(MAKE) $(CS_SETUP_TARGET) PLAIN_RACKET=racket/bin/racketcs

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

@ -2,6 +2,7 @@ srcdir = @srcdir@
builddir = @builddir@ builddir = @builddir@
SCHEME_SRC = @SCHEME_SRC@ SCHEME_SRC = @SCHEME_SRC@
MAKE_BUILD_SCHEME = @MAKE_BUILD_SCHEME@
MACH = @MACH@ MACH = @MACH@
SCHEME_BIN = $(SCHEME_SRC)/$(MACH)/bin/$(MACH)/scheme SCHEME_BIN = $(SCHEME_SRC)/$(MACH)/bin/$(MACH)/scheme
SCHEME_INC = $(SCHEME_SRC)/$(MACH)/boot/$(MACH) SCHEME_INC = $(SCHEME_SRC)/$(MACH)/boot/$(MACH)
@ -104,9 +105,10 @@ known:
cd $(srcdir)/../../schemify && $(MAKE) known-src-generate RACKET="$(BOOTSTRAP_RACKET)" BUILDDIR="$(builddir)/" cd $(srcdir)/../../schemify && $(MAKE) known-src-generate RACKET="$(BOOTSTRAP_RACKET)" BUILDDIR="$(builddir)/"
scheme: scheme:
$(MAKE) $(SCHEME_BIN) if [ "$(MAKE_BUILD_SCHEME)" = "y" ] ; \
then $(MAKE) scheme-make ; fi
$(SCHEME_BIN): scheme-make:
cd @SCHEME_SRC@ && ./configure @SCHEME_CONFIG_ARGS@ cd @SCHEME_SRC@ && ./configure @SCHEME_CONFIG_ARGS@
cd @SCHEME_SRC@ && make cd @SCHEME_SRC@ && make

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

@ -624,6 +624,7 @@ LIBOBJS
FRAMEWORK_PREFIX FRAMEWORK_PREFIX
FRAMEWORK_INSTALL_DIR FRAMEWORK_INSTALL_DIR
SCHEME_CONFIG_ARGS SCHEME_CONFIG_ARGS
MAKE_BUILD_SCHEME
SCHEME_SRC SCHEME_SRC
COMPRESS_COMP COMPRESS_COMP
CONFIGURE_RACKET_SO_COMPILE CONFIGURE_RACKET_SO_COMPILE
@ -3296,9 +3297,11 @@ case "$host_cpu" in
esac esac
SCHEME_SRC=../ChezScheme SCHEME_SRC=../ChezScheme
MAKE_BUILD_SCHEME=y
if test "${enable_scheme}" != "" ; then if test "${enable_scheme}" != "" ; then
SCHEME_SRC="${enable_scheme}" SCHEME_SRC="${enable_scheme}"
MAKE_BUILD_SCHEME=n
fi fi
if test "${enable_racket}" != "" ; then if test "${enable_racket}" != "" ; then
@ -3932,6 +3935,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
makefiles="Makefile" makefiles="Makefile"

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

@ -184,9 +184,11 @@ case "$host_cpu" in
esac esac
SCHEME_SRC=../ChezScheme SCHEME_SRC=../ChezScheme
MAKE_BUILD_SCHEME=y
if test "${enable_scheme}" != "" ; then if test "${enable_scheme}" != "" ; then
SCHEME_SRC="${enable_scheme}" SCHEME_SRC="${enable_scheme}"
MAKE_BUILD_SCHEME=n
fi fi
if test "${enable_racket}" != "" ; then if test "${enable_racket}" != "" ; then
@ -357,6 +359,7 @@ AC_SUBST(NOT_OSX)
AC_SUBST(CONFIGURE_RACKET_SO_COMPILE) AC_SUBST(CONFIGURE_RACKET_SO_COMPILE)
AC_SUBST(COMPRESS_COMP) AC_SUBST(COMPRESS_COMP)
AC_SUBST(SCHEME_SRC) AC_SUBST(SCHEME_SRC)
AC_SUBST(MAKE_BUILD_SCHEME)
AC_SUBST(SCHEME_CONFIG_ARGS) AC_SUBST(SCHEME_CONFIG_ARGS)
AC_SUBST(FRAMEWORK_INSTALL_DIR) AC_SUBST(FRAMEWORK_INSTALL_DIR)
AC_SUBST(FRAMEWORK_PREFIX) AC_SUBST(FRAMEWORK_PREFIX)