Skip to content

Commit d151e18

Browse files
cixtorcixtor
committed
Move llvm out of stageN/lib so that the host building stage 1+ can
have a newer and incompatible llvm with the bots.
1 parent c893188 commit d151e18

File tree

11 files changed

+47
-28
lines changed

11 files changed

+47
-28
lines changed

‎Makefile.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ X := $(CFG_EXE_SUFFIX)
109109
VPATH := $(S)doc $(S)src
110110

111111
# Compilers we build, we now know how to run.
112-
STAGE0 := $(Q)$(call CFG_RUN_TARG,stage0,\
112+
STAGE0 := $(Q)$(call CFG_RUN_TARG,stage0,stage0,\
113113
stage0/rustc$(X) $(CFG_RUSTC_FLAGS))
114-
STAGE1 := $(Q)$(call CFG_RUN_TARG,stage0, \
114+
STAGE1 := $(Q)$(call CFG_RUN_TARG,stage1,stage0, \
115115
$(CFG_VALGRIND_COMPILE) stage1/rustc$(X) \
116116
$(CFG_RUSTC_FLAGS))
117-
STAGE2 := $(Q)$(call CFG_RUN_TARG,stage1, \
117+
STAGE2 := $(Q)$(call CFG_RUN_TARG,stage2,stage1, \
118118
$(CFG_VALGRIND_COMPILE) stage2/rustc$(X) \
119119
$(CFG_RUSTC_FLAGS))
120-
STAGE3 := $(Q)$(call CFG_RUN_TARG,stage2, \
120+
STAGE3 := $(Q)$(call CFG_RUN_TARG,stage3,stage2, \
121121
$(CFG_VALGRIND_COMPILE) stage3/rustc$(X) \
122122
$(CFG_RUSTC_FLAGS))
123123

‎mk/clean.mk

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

‎mk/platform.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ ifdef CFG_UNIXY
7777

7878
CFG_PATH_MUNGE := true
7979
CFG_EXE_SUFFIX :=
80-
CFG_RUN_TARG=$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1)/lib $(2)
80+
CFG_RUN_TARG=\
81+
$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1):$(CFG_BUILD_DIR)/$(2)/lib $(3)
8182
CFG_RUN_TEST=\
8283
$(CFG_LDENV)=$(call CFG_TESTLIB,$(1)) \
8384
$(CFG_VALGRIND) $(1)
@@ -118,7 +119,7 @@ ifdef CFG_WINDOWSY
118119
CFG_LDPATH :=$(CFG_LLVM_BINDIR)
119120
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
120121
CFG_RUN_TEST=PATH="$(CFG_LDPATH):$(call CFG_TESTLIB,$(1))" $(1)
121-
CFG_RUN_TARG=PATH="$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH)" $(2)
122+
CFG_RUN_TARG=PATH="$(CFG_BUILD_DIR)/$(2)/lib:$(CFG_LDPATH)" $(3)
122123

123124
ifndef CFG_ENABLE_MINGW_CROSS
124125
CFG_PATH_MUNGE := $(strip perl -i.bak -p \

‎mk/pp.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L no-reformat)
99
reformat: $(SREQ1)
1010
@$(call E, reformat [stage1]: $@)
1111
for i in $(PP_INPUTS_FILTERED); \
12-
do $(call CFG_RUN_TARG,stage0, stage1/rustc$(X)) \
12+
do $(call CFG_RUN_TARG,stage0,stage0,stage1/rustc$(X)) \
1313
--pretty normal $$i >$$i.tmp; \
1414
if cmp --silent $$i.tmp $$i; \
1515
then echo no changes to $$i; rm $$i.tmp; \

‎mk/snap.mk

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

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

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

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

‎mk/stage0.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,9 @@ stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)
1313

1414
stage0/intrinsics.bc: stage0/rustc$(X)
1515
$(Q)touch $@
16+
17+
stage0/lib/$(CFG_RUSTLLVM): stage0/rustc$(X)
18+
$(Q)touch $@
19+
20+
stage0/lib/$(CFG_RUNTIME): stage0/rustc$(X)
21+
$(Q)touch $@

‎mk/stage1.mk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
stage1/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
22
stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
3-
stage1/lib/$(CFG_RUNTIME) stage1/lib/$(CFG_RUSTLLVM) \
3+
stage1/lib/$(CFG_RUNTIME) stage1/$(CFG_RUSTLLVM) \
44
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/lib/$(CFG_RUNTIME) stage1/lib/$(CFG_RUSTLLVM) \
10+
stage1/lib/$(CFG_RUNTIME) stage1/$(CFG_RUSTLLVM) \
1111
stage1/lib/glue.o $(LREQ) $(MKFILES)
1212
@$(call E, compile_and_link: $@)
1313
$(STAGE1) --lib --static -o $@ $<
1414

1515
stage1/lib/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) \
16-
stage1/intrinsics.bc $(LREQ) $(MKFILES)
16+
stage1/intrinsics.bc stage1/$(CFG_RUSTLLVM) \
17+
stage0/lib/$(CFG_RUNTIME)
1718
@$(call E, generate: $@)
1819
$(STAGE1) -c -o $@ --glue
1920

@@ -25,7 +26,7 @@ stage1/lib/$(CFG_RUNTIME): rt/$(CFG_RUNTIME)
2526
@$(call E, cp: $@)
2627
$(Q)cp $< $@
2728

28-
stage1/lib/$(CFG_RUSTLLVM): rustllvm/$(CFG_RUSTLLVM)
29+
stage1/$(CFG_RUSTLLVM): rustllvm/$(CFG_RUSTLLVM)
2930
@$(call E, cp: $@)
3031
$(Q)cp $< $@
3132

‎mk/stage2.mk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
stage2/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
22
stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) stage2/intrinsics.bc \
3-
stage2/lib/$(CFG_RUNTIME) stage2/lib/$(CFG_RUSTLLVM) \
3+
stage2/lib/$(CFG_RUNTIME) stage2/$(CFG_RUSTLLVM) \
44
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/lib/$(CFG_RUNTIME) stage2/lib/$(CFG_RUSTLLVM) \
10+
stage2/lib/$(CFG_RUNTIME) stage2/$(CFG_RUSTLLVM) \
1111
stage2/lib/glue.o $(LREQ) $(MKFILES)
1212
@$(call E, compile_and_link: $@)
1313
$(STAGE2) --lib --static -o $@ $<
1414

1515
stage2/lib/glue.o: stage2/rustc$(X) stage1/lib/$(CFG_STDLIB) \
16-
stage2/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
16+
stage2/intrinsics.bc stage2/$(CFG_RUSTLLVM) \
17+
stage1/lib/$(CFG_RUNTIME)
1718
@$(call E, generate: $@)
1819
$(STAGE2) -c -o $@ --glue
1920

@@ -25,7 +26,7 @@ stage2/lib/$(CFG_RUNTIME): rt/$(CFG_RUNTIME)
2526
@$(call E, cp: $@)
2627
$(Q)cp $< $@
2728

28-
stage2/lib/$(CFG_RUSTLLVM): rustllvm/$(CFG_RUSTLLVM)
29+
stage2/$(CFG_RUSTLLVM): rustllvm/$(CFG_RUSTLLVM)
2930
@$(call E, cp: $@)
3031
$(Q)cp $< $@
3132

‎mk/stage3.mk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
stage3/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
22
stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) stage3/intrinsics.bc \
3-
stage3/lib/$(CFG_RUNTIME) stage3/lib/$(CFG_RUSTLLVM) \
3+
stage3/lib/$(CFG_RUNTIME) stage3/$(CFG_RUSTLLVM) \
44
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/lib/$(CFG_RUNTIME) stage3/lib/$(CFG_RUSTLLVM) \
10+
stage3/lib/$(CFG_RUNTIME) stage3/$(CFG_RUSTLLVM) \
1111
stage3/lib/glue.o $(LREQ) $(MKFILES)
1212
@$(call E, compile_and_link: $@)
1313
$(STAGE3) --lib --static -o $@ $<
1414

1515
stage3/lib/glue.o: stage3/rustc$(X) stage2/lib/$(CFG_STDLIB) \
16-
stage3/intrinsics.bc rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
16+
stage3/intrinsics.bc stage3/$(CFG_RUSTLLVM) \
17+
stage2/lib/$(CFG_RUNTIME)
1718
@$(call E, generate: $@)
1819
$(STAGE3) -c -o $@ --glue
1920

@@ -25,7 +26,7 @@ stage3/lib/$(CFG_RUNTIME): rt/$(CFG_RUNTIME)
2526
@$(call E, cp: $@)
2627
$(Q)cp $< $@
2728

28-
stage3/lib/$(CFG_RUSTLLVM): rustllvm/$(CFG_RUSTLLVM)
29+
stage3/$(CFG_RUSTLLVM): rustllvm/$(CFG_RUSTLLVM)
2930
@$(call E, cp: $@)
3031
$(Q)cp $< $@
3132

‎src/etc/get-snapshot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def unpack_snapshot(snap):
99
print("opening snapshot " + dl_path)
1010
tar = tarfile.open(dl_path)
1111
kernel = get_kernel()
12-
for name in snapshot_files[kernel]:
12+
for name in old_snapshot_files[kernel]:
1313
p = "rust-stage0/" + name
1414
fp = os.path.join("stage0", name)
1515
print("extracting " + fp)

‎src/etc/snapshot.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def scrub(b):
1515
download_dir_base = "dl"
1616
download_unpack_base = os.path.join(download_dir_base, "unpack")
1717

18-
snapshot_files = {
18+
old_snapshot_files = {
1919
"linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
2020
"lib/librustrt.so", "lib/librustllvm.so", "intrinsics.bc"],
2121
"macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib",
@@ -24,6 +24,15 @@ def scrub(b):
2424
"lib/rustrt.dll", "lib/rustllvm.dll", "intrinsics.bc"]
2525
}
2626

27+
snapshot_files = {
28+
"linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
29+
"lib/librustrt.so", "librustllvm.so", "intrinsics.bc"],
30+
"macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib",
31+
"lib/librustrt.dylib", "librustllvm.dylib", "intrinsics.bc"],
32+
"winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib",
33+
"lib/rustrt.dll", "rustllvm.dll", "intrinsics.bc"]
34+
}
35+
2736
def parse_line(n, line):
2837
global snapshotfile
2938

0 commit comments

Comments
 (0)