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

cs: unbreak Makefile for non-cross build

Browse Source
This commit is contained in:
Matthew Flatt 2019-03-02 06:42:40 -07:00
parent c890edeea4
commit 068cfc6330
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ scheme-cross:
# Rebuild cross "petite.boot" and "scheme.boot" when older # Rebuild cross "petite.boot" and "scheme.boot" when older
# than the build-host "scheme.boot" # than the build-host "scheme.boot"
@SCHEME_SRC@/@TARGET_MACH@/boot/@TARGET_MACH@/scheme.boot: @SCHEME_SRC@/@MACH@/boot/@MACH@/scheme.boot @SCHEME_SRC@/@TARGET_MACH@/boot/@TARGET_MACH@/scheme.boot@DIFF_MACH@: @SCHEME_SRC@/@MACH@/boot/@MACH@/scheme.boot
cd @SCHEME_SRC@/@TARGET_MACH@/s && $(MAKE) -f Mf-cross m=@MACH@ xm=@TARGET_MACH@ Scheme="$(SCHEME_BIN)" SCHEMEHEAPDIRS="$(SCHEME_INC)" cd @SCHEME_SRC@/@TARGET_MACH@/s && $(MAKE) -f Mf-cross m=@MACH@ xm=@TARGET_MACH@ Scheme="$(SCHEME_BIN)" SCHEMEHEAPDIRS="$(SCHEME_INC)"
XPATCH = XPATCH =
@ -277,7 +277,7 @@ grres.o: $(srcdir)/../../worksp/gracket/gracket.rc $(srcdir)/../../worksp/gracke
libres.o: $(srcdir)/../../worksp/cs/libracket.rc libres.o: $(srcdir)/../../worksp/cs/libracket.rc
@WINDRES@ -i $(srcdir)/../../worksp/cs/libracket.rc -o libres.o @WINDRES@ -i $(srcdir)/../../worksp/cs/libracket.rc -o libres.o
starter: starter@MINGW@:
$(MAKE) MzStart.exe $(MAKE) MzStart.exe
$(MAKE) MrStart.exe $(MAKE) MrStart.exe

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

@ -642,6 +642,7 @@ OSX
TT_CROSS_MODE TT_CROSS_MODE
T_CROSS_MODE T_CROSS_MODE
CROSS_MODE CROSS_MODE
DIFF_MACH
TARGET_MACH TARGET_MACH
MACH MACH
SCHEME_DIR SCHEME_DIR
@ -4135,6 +4136,11 @@ if test "${enable_compress}" = "yes" ; then
COMPRESS_COMP="--compress" COMPRESS_COMP="--compress"
fi fi
DIFF_MACH=skip
if test "${MACH}" != "${TARGET_MACH}" ; then
DIFF_MACH=
fi
############## Strip tool ################ ############## Strip tool ################
if test "${enable_strip}" = "" ; then if test "${enable_strip}" = "" ; then
@ -4959,6 +4965,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
makefiles="Makefile" makefiles="Makefile"

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

@ -392,6 +392,11 @@ if test "${enable_compress}" = "yes" ; then
COMPRESS_COMP="--compress" COMPRESS_COMP="--compress"
fi fi
DIFF_MACH=skip
if test "${MACH}" != "${TARGET_MACH}" ; then
DIFF_MACH=
fi
############## Strip tool ################ ############## Strip tool ################
m4_include(../ac/strip.m4) m4_include(../ac/strip.m4)
@ -595,6 +600,7 @@ AC_SUBST(RACKET)
AC_SUBST(SCHEME_DIR) AC_SUBST(SCHEME_DIR)
AC_SUBST(MACH) AC_SUBST(MACH)
AC_SUBST(TARGET_MACH) AC_SUBST(TARGET_MACH)
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)