Skip to content

Commit 5e80032

Browse files
cixtorcixtor
committed
---
yaml --- r: 3149 b: refs/heads/master c: 32895ad h: refs/heads/master i: 3147: 4480701 v: v3
1 parent b407e92 commit 5e80032

File tree

6 files changed

+34
-88
lines changed

6 files changed

+34
-88
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: 02c0501a6185da2d3bfce2be1b2bc02abbd36bb9
2+
refs/heads/master: 32895ad99013b088b7dee51d173e177536103673

‎trunk/Makefile.in

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ endif
4444
CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
4545
CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
4646
CFG_STDLIB :=$(call CFG_LIB_NAME,std)
47-
CFG_RUSTCLIB :=$(call CFG_LIB_NAME,rustc)
4847

4948
# version-string calculation
5049
CFG_GIT_DIR := $(CFG_SRC_DIR).git
@@ -107,12 +106,15 @@ VPATH := $(S)doc $(S)src
107106

108107
# Compilers we build, we now know how to run.
109108
STAGE0 := $(Q)$(call CFG_RUN_TARG,stage0,\
110-
stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1)
111-
STAGE1 := $(Q)$(call CFG_RUN_TARG,stage1, \
109+
stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0)
110+
STAGE1 := $(Q)$(call CFG_RUN_TARG,stage0, \
112111
$(CFG_VALGRIND_COMPILE) stage1/rustc$(X) \
113-
$(CFG_RUSTC_FLAGS) -L stage2)
114-
STAGE2 := $(Q)$(call CFG_RUN_TARG,stage2, \
112+
$(CFG_RUSTC_FLAGS) -L stage1)
113+
STAGE2 := $(Q)$(call CFG_RUN_TARG,stage1, \
115114
$(CFG_VALGRIND_COMPILE) stage2/rustc$(X) \
115+
$(CFG_RUSTC_FLAGS) -L stage2)
116+
STAGE3 := $(Q)$(call CFG_RUN_TARG,stage2, \
117+
$(CFG_VALGRIND_COMPILE) stage3/rustc$(X) \
116118
$(CFG_RUSTC_FLAGS) -L stage3)
117119

118120
# "Source" files we generate in builddir along the way.
@@ -146,9 +148,9 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
146148
######################################################################
147149

148150
LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
149-
SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage1/glue.o stage1/$(CFG_STDLIB)
150-
SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage2/glue.o stage2/$(CFG_STDLIB)
151-
SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage3/glue.o stage3/$(CFG_STDLIB)
151+
SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage0/glue.o stage0/$(CFG_STDLIB)
152+
SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage1/glue.o stage1/$(CFG_STDLIB)
153+
SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage2/glue.o stage2/$(CFG_STDLIB)
152154

153155

154156
######################################################################

‎trunk/mk/fuzzer.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
FUZZER_CRATE := $(S)src/fuzzer/fuzzer.rc
66
FUZZER_INPUTS := $(wildcard $(addprefix $(S)src/fuzzer/, *.rs))
77

8-
stage2/fuzzer.o: $(FUZZER_CRATE) $(FUZZER_INPUTS) $(SREQ1) \
9-
stage2/$(CFG_RUSTCLIB)
8+
stage2/fuzzer.o: $(FUZZER_CRATE) $(FUZZER_INPUTS) $(SREQ1)
109
@$(call E, compile: $@)
1110
$(STAGE1) -c -o $@ $<
1211

‎trunk/mk/stage1.mk

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
1-
stage1/std.o: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
2-
stage0/rustc$(X) stage0/$(CFG_STDLIB) stage0/intrinsics.bc \
1+
stage1/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
2+
stage1/rustc$(X) stage0/$(CFG_STDLIB) stage1/intrinsics.bc \
33
$(LREQ) $(MKFILES)
4-
@$(call E, compile: $@)
5-
$(STAGE0) -c --shared -o $@ $<
4+
@$(call E, compile_and_link: $@)
5+
$(STAGE1) --shared -o $@ $<
66

7-
stage1/$(CFG_STDLIB): stage1/std.o stage1/glue.o
8-
@$(call E, link: $@)
9-
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o $(CFG_GCCISH_LINK_FLAGS) \
10-
-o $@ $< -Lstage1 -Lrt -lrustrt
11-
12-
stage1/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
13-
@$(call E, compile: $@)
14-
$(STAGE0) -c --shared -o $@ $<
15-
16-
stage1/$(CFG_RUSTCLIB): stage1/librustc.o stage1/glue.o
17-
@$(call E, link: $@)
18-
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o $(CFG_GCCISH_LINK_FLAGS) \
19-
-o $@ $< -Lstage1 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd
20-
21-
stage1/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
22-
@$(call E, compile: $@)
23-
$(STAGE0) -c -o $@ $<
24-
25-
stage1/glue.o: stage0/rustc$(X) stage0/$(CFG_STDLIB) stage0/intrinsics.bc \
7+
stage1/glue.o: stage1/rustc$(X) stage0/$(CFG_STDLIB) stage0/intrinsics.bc \
268
$(LREQ) $(MKFILES)
279
@$(call E, generate: $@)
28-
$(STAGE0) -c -o $@ --glue
10+
$(STAGE1) -c -o $@ --glue
2911

3012
stage1/intrinsics.bc: $(INTRINSICS_BC)
3113
@$(call E, cp: $@)
@@ -41,11 +23,6 @@ stage1/%.o: stage1/%.s
4123
@$(call E, assemble [gcc]: $@)
4224
$(Q)gcc $(CFG_GCCISH_CFLAGS) -o $@ -c $<
4325

44-
stage1/%$(X): stage1/%.o $(SREQ0)
45-
@$(call E, link [gcc]: $@)
46-
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o -o $@ $< \
47-
-Lstage1 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
48-
@# dsymutil sometimes fails or prints a warning, but the
49-
@# program still runs. Since it simplifies debugging other
50-
@# programs, I\'ll live with the noise.
51-
-$(Q)$(CFG_DSYMUTIL) $@
26+
stage1/%$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
27+
@$(call E, compile_and_link: $@)
28+
$(STAGE0) -o $@ $<

‎trunk/mk/stage2.mk

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
1-
stage2/std.o: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
2-
stage1/rustc$(X) stage1/$(CFG_STDLIB) stage1/intrinsics.bc \
1+
stage2/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
2+
stage2/rustc$(X) stage1/$(CFG_STDLIB) stage2/intrinsics.bc \
33
$(LREQ) $(MKFILES)
4-
@$(call E, compile: $@)
5-
$(STAGE1) -c --shared -o $@ $<
4+
@$(call E, compile_and_link: $@)
5+
$(STAGE2) --shared -o $@ $<
66

7-
stage2/$(CFG_STDLIB): stage2/std.o stage2/glue.o
8-
@$(call E, link: $@)
9-
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o $(CFG_GCCISH_LINK_FLAGS) -o \
10-
$@ $< -Lstage2 -Lrt -lrustrt
11-
12-
stage2/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
13-
@$(call E, compile: $@)
14-
$(STAGE1) -c --shared -o $@ $<
15-
16-
stage2/$(CFG_RUSTCLIB): stage2/librustc.o stage2/glue.o
17-
@$(call E, link: $@)
18-
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o $(CFG_GCCISH_LINK_FLAGS) \
19-
-o $@ $< -Lstage2 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd
20-
21-
stage2/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
22-
@$(call E, compile: $@)
23-
$(STAGE1) -c -o $@ $<
24-
25-
stage2/glue.o: stage1/rustc$(X) stage1/$(CFG_STDLIB) stage1/intrinsics.bc \
7+
stage2/glue.o: stage2/rustc$(X) stage1/$(CFG_STDLIB) stage1/intrinsics.bc \
268
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
279
@$(call E, generate: $@)
28-
$(STAGE1) -c -o $@ --glue
10+
$(STAGE2) -c -o $@ --glue
2911

3012
stage2/intrinsics.bc: $(INTRINSICS_BC)
3113
@$(call E, cp: $@)
@@ -41,11 +23,6 @@ stage2/%.o: stage2/%.s
4123
@$(call E, assemble [gcc]: $@)
4224
$(Q)gcc $(CFG_GCCISH_CFLAGS) -o $@ -c $<
4325

44-
stage2/%$(X): stage2/%.o $(SREQ1)
45-
@$(call E, link [gcc]: $@)
46-
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o -o $@ $< \
47-
-Lstage2 -Lrustllvm -Lrt rt/main.o -lrustrt -lrustllvm -lstd -lm
48-
@# dsymutil sometimes fails or prints a warning, but the
49-
@# program still runs. Since it simplifies debugging other
50-
@# programs, I\'ll live with the noise.
51-
-$(Q)$(CFG_DSYMUTIL) $@
26+
stage2/%$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
27+
@$(call E, compile_and_link: $@)
28+
$(STAGE1) -o $@ $<

‎trunk/mk/stage3.mk

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

7-
stage3/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
8-
@$(call E, compile: $@)
9-
$(STAGE2) -c --shared -o $@ $<
10-
11-
stage3/$(CFG_RUSTCLIB): stage2/librustc.o stage2/glue.o
12-
@$(call E, link: $@)
13-
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o $(CFG_GCCISH_LINK_FLAGS) \
14-
-o $@ $< -Lstage2 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd
15-
16-
stage3/glue.o: stage2/rustc$(X) stage2/$(CFG_STDLIB) stage2/intrinsics.bc \
7+
stage3/glue.o: stage3/rustc$(X) stage2/$(CFG_STDLIB) stage3/intrinsics.bc \
178
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
189
@$(call E, generate: $@)
19-
$(STAGE2) -c -o $@ --glue
10+
$(STAGE3) -c -o $@ --glue
2011

2112
stage3/intrinsics.bc: $(INTRINSICS_BC)
2213
@$(call E, cp: $@)

0 commit comments

Comments
 (0)