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

avoid gmake-ism in racket makefile

Browse Source
This commit is contained in:
Matthew Flatt 2010-07-20 19:01:56 -06:00
parent a9fb29ced3
commit 68c49a2228
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/configure vendored
View File

@ -699,6 +699,7 @@ XFORMFLAGS
MZBINTARGET MZBINTARGET
MZINSTALLTARGET MZINSTALLTARGET
EXTRA_GMP_OBJ EXTRA_GMP_OBJ
EXTRA_GMP_DEP
OSX OSX
NOT_OSX NOT_OSX
FRAMEWORK_INSTALL_DIR FRAMEWORK_INSTALL_DIR
@ -5843,6 +5844,7 @@ EXTRALIBS=
# for gmp assembly: # for gmp assembly:
EXTRA_GMP_OBJ= EXTRA_GMP_OBJ=
EXTRA_GMP_DEP=
# For Racket targets: # For Racket targets:
OSX=".osx" OSX=".osx"
@ -5908,6 +5910,7 @@ case $OS in
;; ;;
alpha) alpha)
EXTRA_GMP_OBJ="gmp_alpha_gcc.o" EXTRA_GMP_OBJ="gmp_alpha_gcc.o"
EXTRA_GMP_DEP='$(EXTRA_GMP_DEP_FILE)'
;; ;;
i386|i486|i586|i686) i386|i486|i586|i686)
enable_futures_by_default=yes enable_futures_by_default=yes
@ -5922,6 +5925,7 @@ case $OS in
COMPFLAGS="$COMPFLAGS -ieee_with_inexact -assume noaligned_objects" COMPFLAGS="$COMPFLAGS -ieee_with_inexact -assume noaligned_objects"
elif test "$CC" = "gcc" ; then elif test "$CC" = "gcc" ; then
EXTRA_GMP_OBJ="gmp_alpha_gcc.o" EXTRA_GMP_OBJ="gmp_alpha_gcc.o"
EXTRA_GMP_DEP='$(EXTRA_GMP_DEP_FILE)'
fi fi
;; ;;
HP-UX) HP-UX)
@ -12187,6 +12191,7 @@ LIBS="$LIBS $EXTRALIBS"
mk_needed_dir() mk_needed_dir()
@ -13064,6 +13069,7 @@ XFORMFLAGS!$XFORMFLAGS$ac_delim
MZBINTARGET!$MZBINTARGET$ac_delim MZBINTARGET!$MZBINTARGET$ac_delim
MZINSTALLTARGET!$MZINSTALLTARGET$ac_delim MZINSTALLTARGET!$MZINSTALLTARGET$ac_delim
EXTRA_GMP_OBJ!$EXTRA_GMP_OBJ$ac_delim EXTRA_GMP_OBJ!$EXTRA_GMP_OBJ$ac_delim
EXTRA_GMP_DEP!$EXTRA_GMP_DEP$ac_delim
OSX!$OSX$ac_delim OSX!$OSX$ac_delim
NOT_OSX!$NOT_OSX$ac_delim NOT_OSX!$NOT_OSX$ac_delim
FRAMEWORK_INSTALL_DIR!$FRAMEWORK_INSTALL_DIR$ac_delim FRAMEWORK_INSTALL_DIR!$FRAMEWORK_INSTALL_DIR$ac_delim
@ -13075,7 +13081,6 @@ MZRT_CGC_FLAGS!$MZRT_CGC_FLAGS$ac_delim
LIBATOM!$LIBATOM$ac_delim LIBATOM!$LIBATOM$ac_delim
GRACKETLINKER!$GRACKETLINKER$ac_delim GRACKETLINKER!$GRACKETLINKER$ac_delim
LIBSFX!$LIBSFX$ac_delim LIBSFX!$LIBSFX$ac_delim
WXLIBS!$WXLIBS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -13117,6 +13122,7 @@ _ACEOF
ac_delim='%!_!# ' ac_delim='%!_!# '
for ac_last_try in false false false false false :; do for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF cat >conf$$subs.sed <<_ACEOF
WXLIBS!$WXLIBS$ac_delim
WXVARIANT!$WXVARIANT$ac_delim WXVARIANT!$WXVARIANT$ac_delim
ICP!$ICP$ac_delim ICP!$ICP$ac_delim
MRLIBINSTALL!$MRLIBINSTALL$ac_delim MRLIBINSTALL!$MRLIBINSTALL$ac_delim
@ -13161,7 +13167,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

4
src/racket/configure.ac
View File

@ -540,6 +540,7 @@ EXTRALIBS=
# for gmp assembly: # for gmp assembly:
EXTRA_GMP_OBJ= EXTRA_GMP_OBJ=
EXTRA_GMP_DEP=
# For Racket targets: # For Racket targets:
OSX=".osx" OSX=".osx"
@ -605,6 +606,7 @@ case $OS in
;; ;;
alpha) alpha)
EXTRA_GMP_OBJ="gmp_alpha_gcc.o" EXTRA_GMP_OBJ="gmp_alpha_gcc.o"
EXTRA_GMP_DEP='$(EXTRA_GMP_DEP_FILE)'
;; ;;
i386|i486|i586|i686) i386|i486|i586|i686)
enable_futures_by_default=yes enable_futures_by_default=yes
@ -619,6 +621,7 @@ case $OS in
COMPFLAGS="$COMPFLAGS -ieee_with_inexact -assume noaligned_objects" COMPFLAGS="$COMPFLAGS -ieee_with_inexact -assume noaligned_objects"
elif test "$CC" = "gcc" ; then elif test "$CC" = "gcc" ; then
EXTRA_GMP_OBJ="gmp_alpha_gcc.o" EXTRA_GMP_OBJ="gmp_alpha_gcc.o"
EXTRA_GMP_DEP='$(EXTRA_GMP_DEP_FILE)'
fi fi
;; ;;
HP-UX) HP-UX)
@ -1493,6 +1496,7 @@ AC_SUBST(XFORMFLAGS)
AC_SUBST(MZBINTARGET) AC_SUBST(MZBINTARGET)
AC_SUBST(MZINSTALLTARGET) AC_SUBST(MZINSTALLTARGET)
AC_SUBST(EXTRA_GMP_OBJ) AC_SUBST(EXTRA_GMP_OBJ)
AC_SUBST(EXTRA_GMP_DEP)
AC_SUBST(OSX) AC_SUBST(OSX)
AC_SUBST(NOT_OSX) AC_SUBST(NOT_OSX)
AC_SUBST(FRAMEWORK_INSTALL_DIR) AC_SUBST(FRAMEWORK_INSTALL_DIR)

3
src/racket/gc2/Makefile.in
View File

@ -374,7 +374,8 @@ FOREIGN_USED_OBJSLIB = $(FOREIGN_OBJSLIB)
FOREIGN_NOT_USED_LIB = $(FOREIGN_OBJ) FOREIGN_NOT_USED_LIB = $(FOREIGN_OBJ)
FOREIGN_NOT_USED_OBJSLIB = FOREIGN_NOT_USED_OBJSLIB =
EXTRA_GMP := $(if @EXTRA_GMP_OBJ@,../src/@EXTRA_GMP_OBJ@,) EXTRA_GMP_DEP_FILE = ../src/@EXTRA_GMP_OBJ@
EXTRA_GMP = @EXTRA_GMP_DEP@
EXTRA_OBJS_T = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_LIB) EXTRA_OBJS_T = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_LIB)
EXTRA_OBJS_L = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) EXTRA_OBJS_L = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB)