Skip to content

Commit f45524d

Browse files
committed
This time, I'm almost sure it'll work
(Tinderbox workaround kludge)
1 parent 66c1ca8 commit f45524d

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Makefile.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ define SREQ
166166
ifdef CFG_DISABLE_SHAREDSTD
167167
SREQ$(1) = stage$(1)/rustc$(X) \
168168
stage$(1)/$$(CFG_RUNTIME) \
169-
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \
170169
stage$(1)/$$(CFG_RUSTLLVM) \
171170
stage$(1)/lib/glue.o \
172171
stage$(1)/lib/main.o \
@@ -175,12 +174,10 @@ SREQ$(1) = stage$(1)/rustc$(X) \
175174
else
176175
SREQ$(1) = stage$(1)/rustc$(X) \
177176
stage$(1)/$$(CFG_RUNTIME) \
178-
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \
179177
stage$(1)/$$(CFG_RUSTLLVM) \
180178
stage$(1)/lib/glue.o \
181179
stage$(1)/lib/main.o \
182180
stage$(1)/lib/$$(CFG_RUNTIME) \
183-
stage$(1)/lib/$$(CFG_STDLIB) \
184181
$$(MKFILES)
185182
endif
186183

@@ -207,7 +204,7 @@ CFG_INFO := $(info cfg: *** compiler is in snapshot transition ***)
207204
CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
208205
CFG_INFO := $(info cfg:)
209206

210-
all: $(SREQ0) $(SREQ1) $(GENERATED) $(DOCS) $(FUZZ)
207+
all: $(SREQ0) $(SREQ1)
211208
else
212209
all: $(SREQ0) $(SREQ1) $(SREQ2) $(SREQ3) $(GENERATED) $(DOCS) $(FUZZ)
213210
endif

src/snapshots.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
S 2011-07-21 c62a9fe
1+
T 2011-07-21 c62a9fe
22
linux-i386 3c8f658093adea1cb0e5b84150d3d342571013b4
33
macos-i386 1833b475fd1adec3df02ab3dd2fb7c6f280a33a5
44
winnt-i386 f6b6b42d00f25d82603b9466229d3229bfce3317

0 commit comments

Comments
 (0)