disable futures when building with SGC

This commit is contained in:
Matthew Flatt 2010-05-12 07:20:59 -06:00
parent cc67852317
commit 8f74a69d44
4 changed files with 14 additions and 14 deletions

View File

@ -137,7 +137,7 @@ xobjects: $(OBJS) main.@LTO@
XFORMDEP = $(srcdir)/gc2.h $(srcdir)/gc2_obj.h $(srcdir)/xform.rkt $(srcdir)/xform-mod.rkt \
$(srcdir)/precomp.c $(srcdir)/../src/schpriv.h $(srcdir)/../include/scheme.h \
$(srcdir)/../sconfig.h $(srcdir)/../uconfig.h $(srcdir)/../src/schemef.h \
$(srcdir)/../sconfig.h ../mzconfig.h $(srcdir)/../uconfig.h $(srcdir)/../src/schemef.h \
$(srcdir)/../src/stypes.h $(srcdir)/../include/schthread.h $(srcdir)/../src/mzrt.h
LIGHTNINGDEP = $(srcdir)/../src/lightning/i386/core.h $(srcdir)/../src/lightning/i386/core-common.h \
@ -333,12 +333,13 @@ gc2.@LTO@: \
$(srcdir)/immobile_boxes.c \
$(srcdir)/../include/scheme.h \
$(srcdir)/../include/schthread.h \
$(srcdir)/../include/../sconfig.h \
$(srcdir)/../include/../uconfig.h \
$(srcdir)/../include/../src/stypes.h \
$(srcdir)/../include/../src/schexn.h \
$(srcdir)/../include/../gc2/gc2.h \
$(srcdir)/../include/../src/schemef.h \
$(srcdir)/../sconfig.h \
../mzconfig.h \
$(srcdir)/../uconfig.h \
$(srcdir)/../src/stypes.h \
$(srcdir)/../src/schexn.h \
$(srcdir)/../gc2/gc2.h \
$(srcdir)/../src/schemef.h \
$(builddir)/../mzconfig.h \
$(srcdir)/../src/mzrt.h \
$(srcdir)/../src/schpriv.h \

View File

@ -4,7 +4,6 @@
#ifndef __MZSCHEME_CONFIGURATION_INFO__
#define __MZSCHEME_CONFIGURATION_INFO__
/* The size of a `char', as computed by sizeof. */
#undef SIZEOF_CHAR
@ -38,9 +37,11 @@
/* Whether pthread_rwlock is availabale: */
#undef HAVE_PTHREAD_RWLOCK
/* Enable futures and/or places: */
/* Enable futures and/or places (but not with sgc): */
#if !defined(USE_SENORA_GC) || defined(NEWGC_BTC_ACCOUNT)
#undef MZ_USE_FUTURES
#undef MZ_USE_PLACES
#endif
/* Configure use of pthreads for the user-thread timer: */
#undef USE_PTHREAD_INSTEAD_OF_ITIMER

View File

@ -1,6 +1,5 @@
/*
Configuration for compiling MzScheme
Configuration for compiling Racket
If you want to set all the flags externally (on the command line
with -D or some other compiler-dependent way), then define
@ -9,12 +8,11 @@
The best flag settings are already provided for some auto-detected
architecture/system/compilers. Otherwise, the default settings
are generic Unix. Send other architecture/system/compiler-specific
info to "plt-bugs@cs.rice.edu".
info to "racket@racket-lang.org".
*/
#ifndef FLAGS_ALREADY_SET
/******** (BEGIN KNOWN ARCHITECTURE/SYSTEM CONFIGURATIONS) ********/
/* First, use configure-generated information */

View File

@ -236,7 +236,7 @@ vector.@LTO@: $(srcdir)/vector.c
gmp_alpha_gcc.@LTO@: $(srcdir)/gmp/gmp_alpha_gcc.s
$(AS) -o gmp_alpha_gcc.@LTO@ $(srcdir)/gmp/gmp_alpha_gcc.s
SCONFIG = $(srcdir)/../sconfig.h $(srcdir)/../uconfig.h
SCONFIG = $(srcdir)/../sconfig.h $(srcdir)/../uconfig.h ../mzconfig.h
# More dependencies