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

cs: fix build of cross-compile racket

Browse Source
This commit is contained in:
Matthew Flatt 2019-03-21 06:52:36 -06:00
parent d0a98cb42a
commit 0be2178f0e
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -459,7 +459,7 @@ native-cs-for-cross-finish:
cd racket/src/build/cross/cs/c; $(MAKE)
racket/src/build/cross/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in
cd racket/src/build/cross/cs/c; ../../../../cs/c/configure
cd racket/src/build/cross/cs/c; ../../../../cs/c/configure --enable-csdefault
# ------------------------------------------------------------
# Both traditional Racket and RacketCS

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

@ -438,6 +438,8 @@ macos-install-gracket:
# ----------------------------------------
# Reconfigure
COMP_SUBDIR_CONFIGURE_ARGS=@COMP_SUBDIR_CONFIGURE_ARGS@
CONFIGURE_SRCS = $(srcdir)/configure $(srcdir)/Makefile.in \
$(srcdir)/../../rktio/Makefile.in $(srcdir)/../../rktio/configure
@ -445,4 +447,4 @@ reconfigure:
$(MAKE) Makefile
Makefile: $(CONFIGURE_SRCS)
$(srcdir)/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS)
$(srcdir)/configure $(COMP_SUBDIR_CONFIGURE_ARGS) $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS)

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

@ -626,6 +626,7 @@ INSTALL_SETUP_RACKET_FLAGS
INSTALL_SETUP_FLAGS
RUN_RACKET
CROSS_COMPILE_TARGET_KIND
COMP_SUBDIR_CONFIGURE_ARGS
CS_COMPILED_SUBDIR
CS_INSTALLED
FRAMEWORK_REL_INSTALL
@ -2609,11 +2610,12 @@ if test "${enable_csdefault}" = "yes" ; then
fi
CS_COMPILED_SUBDIR=1
COMP_SUBDIR_CONFIGURE_ARGS=
if test "${enable_csdefault}" = "yes" ; then
CS_COMPILED_SUBDIR=0
COMP_SUBDIR_CONFIGURE_ARGS=--enable-csdefault
fi
############## Install targets ################
PREFIX_PATH_RELATIVE=/../..
@ -4970,6 +4972,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
makefiles="Makefile"

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

@ -93,11 +93,12 @@ if test "${enable_csdefault}" = "yes" ; then
fi
CS_COMPILED_SUBDIR=1
COMP_SUBDIR_CONFIGURE_ARGS=
if test "${enable_csdefault}" = "yes" ; then
CS_COMPILED_SUBDIR=0
COMP_SUBDIR_CONFIGURE_ARGS=--enable-csdefault
fi
############## Install targets ################
PREFIX_PATH_RELATIVE=/../..
@ -618,6 +619,7 @@ AC_SUBST(FRAMEWORK_PREFIX)
AC_SUBST(FRAMEWORK_REL_INSTALL)
AC_SUBST(CS_INSTALLED)
AC_SUBST(CS_COMPILED_SUBDIR)
AC_SUBST(COMP_SUBDIR_CONFIGURE_ARGS)
AC_SUBST(CROSS_COMPILE_TARGET_KIND)
AC_SUBST(RUN_RACKET)
AC_SUBST(INSTALL_SETUP_FLAGS)