This time, I'm almost sure it'll work

(Tinderbox workaround kludge)
This commit is contained in:
Marijn Haverbeke 2011-07-27 14:33:14 +02:00
parent 66c1ca857b
commit f45524d0d4
2 changed files with 2 additions and 5 deletions

View File

@ -166,7 +166,6 @@ define SREQ
ifdef CFG_DISABLE_SHAREDSTD
SREQ$(1) = stage$(1)/rustc$(X) \
stage$(1)/$$(CFG_RUNTIME) \
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \
stage$(1)/$$(CFG_RUSTLLVM) \
stage$(1)/lib/glue.o \
stage$(1)/lib/main.o \
@ -175,12 +174,10 @@ SREQ$(1) = stage$(1)/rustc$(X) \
else
SREQ$(1) = stage$(1)/rustc$(X) \
stage$(1)/$$(CFG_RUNTIME) \
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \
stage$(1)/$$(CFG_RUSTLLVM) \
stage$(1)/lib/glue.o \
stage$(1)/lib/main.o \
stage$(1)/lib/$$(CFG_RUNTIME) \
stage$(1)/lib/$$(CFG_STDLIB) \
$$(MKFILES)
endif
@ -207,7 +204,7 @@ CFG_INFO := $(info cfg: *** compiler is in snapshot transition ***)
CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
CFG_INFO := $(info cfg:)
all: $(SREQ0) $(SREQ1) $(GENERATED) $(DOCS) $(FUZZ)
all: $(SREQ0) $(SREQ1)
else
all: $(SREQ0) $(SREQ1) $(SREQ2) $(SREQ3) $(GENERATED) $(DOCS) $(FUZZ)
endif

View File

@ -1,4 +1,4 @@
S 2011-07-21 c62a9fe
T 2011-07-21 c62a9fe
linux-i386 3c8f658093adea1cb0e5b84150d3d342571013b4
macos-i386 1833b475fd1adec3df02ab3dd2fb7c6f280a33a5
winnt-i386 f6b6b42d00f25d82603b9466229d3229bfce3317