Skip to content

Commit e61073d

Browse files
brsonbrson
committed
---
yaml --- r: 3697 b: refs/heads/master c: 106d0f3 h: refs/heads/master i: 3695: f96bf13 v: v3
1 parent 1536b1f commit e61073d

File tree

8 files changed

+22
-31
lines changed

8 files changed

+22
-31
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 94f782e6a1e14b9eb89dd0429c4ad8f0e7ba0cf2
2+
refs/heads/master: 106d0f3b7244e45c83f49663bf124ef732c20cb2

‎trunk/Makefile.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
152152
######################################################################
153153

154154
LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
155-
SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage0/glue.o \
155+
SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage0/lib/glue.o \
156156
stage0/lib/$(CFG_STDLIB)
157-
SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage1/glue.o \
157+
SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage1/lib/glue.o \
158158
stage1/lib/$(CFG_STDLIB)
159-
SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage2/glue.o \
159+
SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage2/lib/glue.o \
160160
stage2/lib/$(CFG_STDLIB)
161161

162162

@@ -197,7 +197,7 @@ all: rt/$(CFG_RUNTIME) \
197197
$(DOCS) \
198198
stage1/lib/$(CFG_STDLIB) \
199199
stage1/intrinsics.bc \
200-
stage1/glue.o \
200+
stage1/lib/glue.o \
201201
stage1/rustc$(X) \
202202

203203
else
@@ -211,14 +211,14 @@ all: rt/$(CFG_RUNTIME) \
211211
$(DOCS) \
212212
stage1/lib/$(CFG_STDLIB) \
213213
stage1/intrinsics.bc \
214-
stage1/glue.o \
214+
stage1/lib/glue.o \
215215
stage1/rustc$(X) \
216216
stage2/lib/$(CFG_STDLIB) \
217217
stage2/intrinsics.bc \
218-
stage2/glue.o \
218+
stage2/lib/glue.o \
219219
stage2/rustc$(X) \
220220
stage3/lib/$(CFG_STDLIB) \
221-
stage3/glue.o \
221+
stage3/lib/glue.o \
222222
stage3/intrinsics.bc \
223223
stage3/rustc$(X)
224224

‎trunk/mk/clean.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ clean:
1313
$(Q)rm -f $(C_DEPFILES:%.d=%.d.tmp)
1414
$(Q)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp)
1515
$(Q)rm -f $(GENERATED)
16-
$(Q)rm -f stage0/rustc$(X) stage0/lib/$(CFG_STDLIB)
17-
$(Q)rm -f stage1/rustc$(X) stage1/lib/$(CFG_STDLIB) stage1/glue*
18-
$(Q)rm -f stage2/rustc$(X) stage2/lib/$(CFG_STDLIB) stage2/glue*
19-
$(Q)rm -f stage3/rustc$(X) stage3/lib/$(CFG_STDLIB) stage3/glue*
16+
$(Q)rm -f stage0/rustc$(X) stage0/lib/$(CFG_STDLIB) stage0/lib/glue*
17+
$(Q)rm -f stage1/rustc$(X) stage1/lib/$(CFG_STDLIB) stage1/lib/glue*
18+
$(Q)rm -f stage2/rustc$(X) stage2/lib/$(CFG_STDLIB) stage2/lib/glue*
19+
$(Q)rm -f stage3/rustc$(X) stage3/lib/$(CFG_STDLIB) stage3/lib/glue*
2020
$(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a
2121
$(Q)rm -f rt/$(CFG_RUNTIME)
2222
$(Q)rm -f rt/main.o

‎trunk/mk/snap.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

2-
snap-stage1: stage1/rustc$(X) stage1/glue.o stage1/lib/$(CFG_STDLIB) \
2+
snap-stage1: stage1/rustc$(X) stage1/lib/glue.o stage1/lib/$(CFG_STDLIB) \
33
stage1/lib/libstd.rlib stage1/lib/$(CFG_RUNTIME) \
44
stage1/lib/$(CFG_RUSTLLVM)
55
$(S)src/etc/make-snapshot.py stage1
66

7-
snap-stage2: stage2/rustc$(X) stage2/glue.o stage2/lib/$(CFG_STDLIB) \
7+
snap-stage2: stage2/rustc$(X) stage2/lib/glue.o stage2/lib/$(CFG_STDLIB) \
88
stage2/lib/libstd.rlib stage2/lib/$(CFG_RUNTIME) \
99
stage2/lib/$(CFG_RUSTLLVM)
1010
$(S)src/etc/make-snapshot.py stage2
1111

12-
snap-stage3: stage3/rustc$(X) stage3/glue.o stage3/lib/$(CFG_STDLIB) \
12+
snap-stage3: stage3/rustc$(X) stage3/lib/glue.o stage3/lib/$(CFG_STDLIB) \
1313
stage3/lib/libstd.rlib stage3/lib/$(CFG_RUNTIME) \
1414
stage3/lib/$(CFG_RUSTLLVM)
1515
$(S)src/etc/make-snapshot.py stage3

‎trunk/mk/stage0.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
55

66
# These two will be made in the process of making rustc above.
77

8-
stage0/glue.o: stage0/rustc$(X)
8+
stage0/lib/glue.o: stage0/rustc$(X)
99
$(Q)touch $@
1010

1111
stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)

‎trunk/mk/stage1.mk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
stage1/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
22
stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
33
stage1/lib/$(CFG_RUNTIME) stage1/lib/$(CFG_RUSTLLVM) \
4-
stage1/glue.o $(LREQ) $(MKFILES)
4+
stage1/lib/glue.o $(LREQ) $(MKFILES)
55
@$(call E, compile_and_link: $@)
66
$(STAGE1) --lib -o $@ $<
77

88
stage1/lib/libstd.rlib: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
99
stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
10-
stage1/glue.o $(LREQ) $(MKFILES)
10+
stage1/lib/glue.o $(LREQ) $(MKFILES)
1111
@$(call E, compile_and_link: $@)
1212
$(STAGE1) --lib --static -o $@ $<
1313

@@ -16,9 +16,6 @@ stage1/lib/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) \
1616
@$(call E, generate: $@)
1717
$(STAGE1) -c -o $@ --glue
1818

19-
stage1/glue.o: stage1/lib/glue.o
20-
cp stage1/lib/glue.o stage1/glue.o
21-
2219
stage1/intrinsics.bc: $(INTRINSICS_BC)
2320
@$(call E, cp: $@)
2421
$(Q)cp $< $@

‎trunk/mk/stage2.mk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
stage2/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
22
stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \
33
stage2/lib/$(CFG_RUNTIME) stage2/lib/$(CFG_RUSTLLVM) \
4-
stage2/glue.o $(LREQ) $(MKFILES)
4+
stage2/lib/glue.o $(LREQ) $(MKFILES)
55
@$(call E, compile_and_link: $@)
66
$(STAGE2) --lib -o $@ $<
77

88
stage2/lib/libstd.rlib: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
99
stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \
10-
stage2/glue.o $(LREQ) $(MKFILES)
10+
stage2/lib/glue.o $(LREQ) $(MKFILES)
1111
@$(call E, compile_and_link: $@)
1212
$(STAGE2) --lib --static -o $@ $<
1313

@@ -16,9 +16,6 @@ stage2/lib/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) \
1616
@$(call E, generate: $@)
1717
$(STAGE2) -c -o $@ --glue
1818

19-
stage2/glue.o: stage2/lib/glue.o
20-
cp stage2/lib/glue.o stage2/glue.o
21-
2219
stage2/intrinsics.bc: $(INTRINSICS_BC)
2320
@$(call E, cp: $@)
2421
$(Q)cp $< $@

‎trunk/mk/stage3.mk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
stage3/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
22
stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \
33
stage3/lib/$(CFG_RUNTIME) stage3/lib/$(CFG_RUSTLLVM) \
4-
stage3/glue.o $(LREQ) $(MKFILES)
4+
stage3/lib/glue.o $(LREQ) $(MKFILES)
55
@$(call E, compile_and_link: $@)
66
$(STAGE3) --lib -o $@ $<
77

88
stage3/lib/libstd.rlib: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
99
stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \
10-
stage3/glue.o $(LREQ) $(MKFILES)
10+
stage3/lib/glue.o $(LREQ) $(MKFILES)
1111
@$(call E, compile_and_link: $@)
1212
$(STAGE3) --lib --static -o $@ $<
1313

@@ -16,9 +16,6 @@ stage3/lib/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) \
1616
@$(call E, generate: $@)
1717
$(STAGE3) -c -o $@ --glue
1818

19-
stage3/glue.o: stage3/lib/glue.o
20-
cp stage3/lib/glue.o stage3/glue.o
21-
2219
stage3/intrinsics.bc: $(INTRINSICS_BC)
2320
@$(call E, cp: $@)
2421
$(Q)cp $< $@

0 commit comments

Comments
 (0)