Skip to content

Commit 494243b

Browse files
graydongraydon
committed
---
yaml --- r: 2333 b: refs/heads/master c: 4f52ab5 h: refs/heads/master i: 2331: 899601c v: v3
1 parent 1c9a7fd commit 494243b

File tree

7 files changed

+45
-141
lines changed

7 files changed

+45
-141
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: b453c3c72825f70499819d97b879c805cac1e5b1
2+
refs/heads/master: 4f52ab52c19154f63f09d9f3d066af61264b1600

‎trunk/Makefile.in

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ endif
1111

1212
CFG_INFO := $(info cfg: building on $(CFG_OSTYPE) $(CFG_CPUTYPE))
1313

14-
CFG_BOOT_FLAGS := $(BOOT_FLAGS)
15-
1614
ifdef CFG_DISABLE_OPTIMIZE
1715
$(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))
1816
CFG_RUSTC_FLAGS :=
@@ -128,7 +126,6 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
128126
######################################################################
129127

130128
LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
131-
BREQ := boot/rustboot$(X) stage0/$(CFG_STDLIB)
132129
SREQ0 := stage0/rustc$(X) $(LREQ) stage1/glue.o stage1/$(CFG_STDLIB)
133130
SREQ1 := stage1/rustc$(X) $(LREQ) stage2/glue.o stage2/$(CFG_STDLIB)
134131
SREQ2 := stage2/rustc$(X) $(LREQ) stage3/glue.o stage3/$(CFG_STDLIB)
@@ -145,8 +142,7 @@ export CFG_SRC_DIR
145142
# Single-target rules
146143
######################################################################
147144

148-
all: boot/rustboot$(X) \
149-
rt/$(CFG_RUNTIME) \
145+
all: rt/$(CFG_RUNTIME) \
150146
rustllvm/$(CFG_RUSTLLVM) \
151147
stage0/$(CFG_STDLIB) \
152148
stage0/rustc$(X) \
@@ -157,10 +153,10 @@ all: boot/rustboot$(X) \
157153
stage1/rustc$(X) \
158154
stage2/$(CFG_STDLIB) \
159155
stage2/glue.o \
160-
stage2/rustc$(X)
161-
# stage3/$(CFG_STDLIB) \
162-
# stage3/glue.o \
163-
# stage3/rustc$(X) \
156+
stage2/rustc$(X) \
157+
stage3/$(CFG_STDLIB) \
158+
stage3/glue.o \
159+
stage3/rustc$(X)
164160

165161

166162
######################################################################
@@ -176,10 +172,10 @@ config.mk: $(S)configure $(S)Makefile.in
176172
# Additional makefiles
177173
######################################################################
178174

179-
include $(CFG_SRC_DIR)/mk/boot.mk
180175
include $(CFG_SRC_DIR)/mk/stage0.mk
181176
include $(CFG_SRC_DIR)/mk/stage1.mk
182177
include $(CFG_SRC_DIR)/mk/stage2.mk
178+
include $(CFG_SRC_DIR)/mk/stage3.mk
183179
include $(CFG_SRC_DIR)/mk/rt.mk
184180
include $(CFG_SRC_DIR)/mk/rustllvm.mk
185181
include $(CFG_SRC_DIR)/mk/docs.mk

‎trunk/mk/autodep.mk

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Auto-dependency
33
######################################################################
44

5-
ML_DEPFILES := $(BOOT_MLS:%.ml=%.d)
65
C_DEPFILES := $(RUNTIME_CS:%.cpp=%.d) $(RUSTLLVM_LIB_CS:%.cpp=%.d) \
76
$(RUSTLLVM_OBJS_CS:%.cpp=%.d)
87

@@ -24,57 +23,8 @@ rustllvm/%.d: rustllvm/%.cpp $(MKFILES)
2423
$(Q)rm -f [email protected]
2524
$(Q)mv [email protected] $@
2625

27-
%.d: %.ml $(MKFILES)
28-
@$(call E, dep: $@)
29-
$(Q)ocamldep$(OPT) -slash $(BOOT_ML_DEP_INCS) $< >$@.tmp
30-
$(Q)$(CFG_PATH_MUNGE) $@.tmp
31-
$(Q)rm -f $@.tmp.bak
32-
$(Q)perl -i.bak -pe "s@$(S)src/@@go" $@.tmp
33-
$(Q)rm -f $@.tmp.bak
34-
$(Q)mv $@.tmp $@
35-
36-
%.d: %.mli $(MKFILES)
37-
@$(call E, dep: $@)
38-
$(Q)ocamldep$(OPT) -slash $(BOOT_ML_DEP_INCS) $< >$@.tmp
39-
$(Q)$(CFG_PATH_MUNGE) $@.tmp
40-
$(Q)rm -f $@.tmp.bak
41-
$(Q)perl -i.bak -pe "s@$(S)src/@@go" $@.tmp
42-
$(Q)rm -f $@.tmp.bak
43-
$(Q)mv $@.tmp $@
44-
4526
ifneq ($(MAKECMDGOALS),clean)
46-
-include $(ML_DEPFILES) $(C_DEPFILES)
47-
endif
48-
49-
RUSTBOOT_PROBE := $(wildcard boot/rustboot$(X))
50-
51-
ifneq ($(RUSTBOOT_PROBE),)
52-
CFG_INFO := $(info cfg: using built boot/rustboot$(X) for rust deps)
53-
CRATE_DEPFILES := $(subst $(S)src/,,$(ALL_TEST_CRATES:%.rc=%.d)) \
54-
boot/$(CFG_STDLIB).d \
55-
stage0/rustc$(X).d \
56-
stage0/$(CFG_STDLIB).d
57-
58-
boot/$(CFG_STDLIB).d: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
59-
$(MKFILES) boot/rustboot$(X)
60-
@$(call E, dep: $@)
61-
$(BOOT) -o $(patsubst %.d,%$(X),$@) -shared -rdeps $< >[email protected]
62-
$(Q)$(CFG_PATH_MUNGE) [email protected]
63-
$(Q)rm -f [email protected]
64-
$(Q)mv [email protected] $@
65-
66-
stage0/rustc$(X).d: $(COMPILER_CRATE) $(COMPILER_INPUTS) \
67-
$(STDLIB_CRATE) $(MKFILES) boot/rustboot$(X)
68-
@$(call E, dep: $@)
69-
$(Q)touch $@
70-
71-
%.d: %.rc $(MKFILES)
72-
@$(call E, dep: $@)
73-
$(Q)touch $@
74-
75-
ifneq ($(MAKECMDGOALS),clean)
76-
-include $(CRATE_DEPFILES)
77-
endif
27+
-include $(C_DEPFILES)
7828
endif
7929

80-
depend: boot/rustboot$(X) $(CRATE_DEPFILES) $(ML_DEPFILES) $(C_DEPFILES)
30+
depend: $(C_DEPFILES)

‎trunk/mk/clean.mk

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,17 @@ clean:
2323
$(Q)rm -f $(C_DEPFILES:%.d=%.d.tmp)
2424
$(Q)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp)
2525
$(Q)rm -f $(GENERATED)
26-
$(Q)rm -f boot/rustboot$(X) boot/$(CFG_STDLIB)
2726
$(Q)rm -f stage0/rustc$(X) stage0/$(CFG_STDLIB)
2827
$(Q)rm -f stage1/rustc$(X) stage1/$(CFG_STDLIB) stage1/glue*
2928
$(Q)rm -f stage2/rustc$(X) stage2/$(CFG_STDLIB) stage2/glue*
3029
$(Q)rm -f stage3/rustc$(X) stage3/$(CFG_STDLIB) stage3/glue*
3130
$(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a
3231
$(Q)rm -f rt/$(CFG_RUNTIME)
3332
$(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist
34-
$(Q)rm -f $(foreach ext,cmx cmi cmo cma bc o a d exe,\
35-
$(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext)))
3633
$(Q)rm -f $(foreach ext,o a d bc s exe,$(wildcard stage*/*.$(ext)))
37-
$(Q)rm -Rf $(foreach ext,out out.tmp \
38-
boot$(X) stage0$(X) stage1$(X) stage2$(X) \
39-
bc o s exe dSYM, \
34+
$(Q)rm -Rf $(foreach ext,out out.tmp \
35+
stage0$(X) stage1$(X) stage2$(X) \
36+
bc o s exe dSYM, \
4037
$(wildcard test/*/*.$(ext) test/bench/*/*.$(ext)))
4138
$(Q)rm -Rf $(foreach ext, \
4239
aux cp fn ky log pdf html pg toc tp vr cps, \

‎trunk/mk/dist.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ PKG_FILES = \
1818
$(S)LICENSE.txt $(S)README \
1919
$(S)configure $(S)Makefile.in \
2020
$(addprefix $(S)src/, \
21-
README boot/README comp/README \
22-
$(filter-out $(GENERATED), $(BOOT_MLS)) \
21+
README comp/README \
2322
$(RUNTIME_CS) $(RUNTIME_HDR) \
2423
$(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
2524
$(RUSTLLVM_HDR) \
2625
$(PKG_3RDPARTY)) \
2726
$(GENERATED) \
28-
$(S)src/boot/fe/lexer.ml \
2927
$(COMPILER_INPUTS) \
3028
$(STDLIB_INPUTS) \
3129
$(ALL_TEST_INPUTS) \

‎trunk/mk/stage0.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
22
@$(call E, fetch: $@)
3-
$(S)src/etc/get-snapshot.py
3+
$(Q)$(S)src/etc/get-snapshot.py
4+
$(Q)touch $@
45

56
# These two will be made in the process of making rustc above.
67

78
stage0/glue.o: stage0/rustc$(X)
9+
$(Q)touch $@
810

911
stage0/$(CFG_STDLIB): stage0/rustc$(X)
12+
$(Q)touch $@

0 commit comments

Comments
 (0)