Skip to content

Commit 7f4c879

Browse files
brsonbrson
committed
---
yaml --- r: 5641 b: refs/heads/master c: 38c67a4 h: refs/heads/master i: 5639: 0be7be8 v: v3
1 parent 2fb32a6 commit 7f4c879

File tree

11 files changed

+104
-96
lines changed

11 files changed

+104
-96
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: ed106dd6eaa7d2140c082852d95f79717a48d23d
2+
refs/heads/master: 38c67a4c8d9b0c582c90926ebf23a3672bb5c013

‎trunk/Makefile.in

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -169,32 +169,41 @@ LLC := $(CFG_LLVM_BINDIR)/llc$(X)
169169

170170
define SREQ
171171

172+
# Destinations of artifacts for target architectures
172173
TARGET_ROOT$(1)$(2) = stage$(1)/lib/rustc/$(2)
173-
TARGET_BIN$(1)$(2) = $(TARGET_ROOT$(1)$(2))/bin
174-
TARGET_LIB$(1)$(2) = $(TARGET_ROOT$(1)$(2))/lib
175-
HOST_ROOT$(1) = $(TARGET_ROOT$(1)$$(CFG_HOST_TRIPLE))
176-
HOST_BIN$(1) = $(TARGET_BIN$(1)$$(CFG_HOST_TRIPLE))
177-
HOST_LIB$(1) = $(TARGET_LIB$(1)$$(CFG_HOST_TRIPLE))
174+
TARGET_BIN$(1)$(2) = $$(TARGET_ROOT$(1)$(2))/bin
175+
TARGET_LIB$(1)$(2) = $$(TARGET_ROOT$(1)$(2))
176+
177+
# Destinations of artifacts for the host compiler
178+
HOST_ROOT$(1) = stage$(1)
179+
HOST_BIN$(1) = $$(HOST_ROOT$(1))/bin
180+
HOST_LIB$(1) = $$(HOST_ROOT$(1))/lib
181+
182+
# The target locations of artifacts for the host architecture (used for
183+
# promoting target binaries to host binaries)
184+
TARGET_HOST_ROOT$(1) = $$(TARGET_ROOT$(1)$$(CFG_HOST_TRIPLE))
185+
TARGET_HOST_BIN$(1) = $$(TARGET_BIN$(1)$$(CFG_HOST_TRIPLE))
186+
TARGET_HOST_LIB$(1) = $$(TARGET_LIB$(1)$$(CFG_HOST_TRIPLE))
178187

179188
ifdef CFG_DISABLE_SHAREDSTD
180-
SREQ$(1)$(2) = $(HOST_BIN$(1))/rustc$(X) \
181-
$(HOST_LIB$(1))/$$(CFG_RUNTIME) \
189+
SREQ$(1)$(2) = $$(HOST_BIN$(1))/rustc$(X) \
190+
$$(HOST_LIB$(1))/$$(CFG_RUNTIME) \
182191
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \
183-
$(HOST_LIB$(1))/$$(CFG_RUSTLLVM) \
184-
$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME) \
185-
$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB) \
186-
$(TARGET_LIB$(1)$(2))/intrinsics.bc \
187-
$(TARGET_LIB$(1)$(2))/main.o \
192+
$$(HOST_LIB$(1))/$$(CFG_RUSTLLVM) \
193+
$$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME) \
194+
$$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB) \
195+
$$(TARGET_LIB$(1)$(2))/intrinsics.bc \
196+
$$(TARGET_LIB$(1)$(2))/main.o \
188197
$$(MKFILES)
189198
else
190-
SREQ$(1)$(2) = $(HOST_BIN$(1))/rustc$(X) \
191-
$(HOST_LIB$(1))/$$(CFG_RUNTIME) \
199+
SREQ$(1)$(2) = $$(HOST_BIN$(1))/rustc$(X) \
200+
$$(HOST_LIB$(1))/$$(CFG_RUNTIME) \
192201
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \
193-
$(HOST_LIB$(1))/$$(CFG_RUSTLLVM) \
194-
$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME) \
195-
$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB) \
196-
$(TARGET_LIB$(1)$(2))/intrinsics.bc \
197-
$(TARGET_LIB$(1)$(2))/main.o \
202+
$$(HOST_LIB$(1))/$$(CFG_RUSTLLVM) \
203+
$$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME) \
204+
$$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB) \
205+
$$(TARGET_LIB$(1)$(2))/intrinsics.bc \
206+
$$(TARGET_LIB$(1)$(2))/main.o \
198207
$$(MKFILES)
199208
endif
200209

@@ -205,17 +214,17 @@ else
205214
CFG_VALGRIND_COMPILE$(1) = $$(CFG_VALGRIND_COMPILE)
206215
endif
207216

208-
STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \
209-
$$(CFG_VALGRIND_COMPILE) stage$(1)/bin/rustc$$(X) \
217+
STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,$(1), \
218+
$$(CFG_VALGRIND_COMPILE) $$(HOST_BIN$(1))/rustc$$(X) \
210219
$$(CFG_RUSTC_FLAGS) --target=$(2))
211220

212-
PERF_STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \
213-
$$(CFG_PERF_TOOL) stage$(1)/bin/rustc$$(X) \
221+
PERF_STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,$(1), \
222+
$$(CFG_PERF_TOOL) $$(HOST_BIN$(1))/rustc$$(X) \
214223
$$(CFG_RUSTC_FLAGS) --target=$(2))
215224

216225
endef
217226

218-
FUZZ := stage1/bin/fuzzer$(X)
227+
FUZZ := $(HOST_BIN$(1))/fuzzer$(X)
219228

220229
$(foreach target,$(CFG_TARGET_TRIPLES), \
221230
$(eval $(call SREQ,0,$(target))) \

‎trunk/mk/clean.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ clean-misc:
4444
define CLEAN_STAGE_N
4545

4646
clean$(1)$(2):
47-
$(Q)rm -f stage$(1)/bin/rustc
48-
$(Q)rm -f stage$(1)/bin/fuzzer
49-
$(Q)rm -f stage$(1)/lib/$(CFG_RUNTIME)
50-
$(Q)rm -f stage$(1)/lib/$(CFG_STDLIB)
51-
$(Q)rm -f stage$(1)/lib/$(CFG_RUSTLLVM)
52-
$(Q)rm -f stage$(1)/lib/rustc/$(2)/$(CFG_RUNTIME)
53-
$(Q)rm -f stage$(1)/lib/rustc/$(2)/$(CFG_STDLIB)
54-
$(Q)rm -f stage$(1)/lib/rustc/$(2)/libstd.rlib
55-
$(Q)rm -f stage$(1)/lib/rustc/$(2)/intrinsics.bc
56-
$(Q)rm -f stage$(1)/lib/rustc/$(2)/main.o
47+
$(Q)rm -f $$(HOST_BIN$(1))/rustc
48+
$(Q)rm -f $$(HOST_BIN$(1))/fuzzer
49+
$(Q)rm -f $$(HOST_LIB$(1))/$(CFG_RUNTIME)
50+
$(Q)rm -f $$(HOST_LIB$(1))/$(CFG_STDLIB)
51+
$(Q)rm -f $$(HOST_LIB$(1))/$(CFG_RUSTLLVM)
52+
$(Q)rm -f $$(TARGET_LIB$(1)$(2))/$(CFG_RUNTIME)
53+
$(Q)rm -f $$(TARGET_LIB$(1)$(2))/$(CFG_STDLIB)
54+
$(Q)rm -f $$(TARGET_LIB$(1)$(2))/libstd.rlib
55+
$(Q)rm -f $$(TARGET_LIB$(1)$(2))/intrinsics.bc
56+
$(Q)rm -f $$(TARGET_LIB$(1)$(2))/main.o
5757

5858
endef
5959

‎trunk/mk/fuzzer.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ FUZZER_INPUTS := $(wildcard $(addprefix $(S)src/fuzzer/, *.rs))
44
define FUZZ_STAGE_N
55

66
stage$(2)/bin/fuzzer$$(X): $$(FUZZER_CRATE) $$(FUZZER_INPUTS) \
7-
$$(SREQ$(2)$(CFG_HOST_TRIPLE)) \
8-
stage$(2)/lib/$$(CFG_RUNTIME) \
9-
stage$(2)/lib/$$(CFG_RUSTLLVM) \
10-
stage$(2)/lib/$$(CFG_STDLIB) \
11-
stage$(2)/lib/$$(CFG_LIBRUSTC)
7+
$$(SREQ$(2)$$(CFG_HOST_TRIPLE)) \
8+
$$(HOST_LIB$(2))/$$(CFG_RUNTIME) \
9+
$$(HOST_LIB$(2))/$$(CFG_RUSTLLVM) \
10+
$$(HOST_LIB$(2))/$$(CFG_STDLIB) \
11+
$$(HOST_LIB$(2))/$$(CFG_LIBRUSTC)
1212
@$$(call E, compile_and_link: $$@)
13-
$$(STAGE$(1)) -L stage1/lib -o $$@ $$<
13+
$$(STAGE$(1)) -L $$(HOST_LIB$(2)) -o $$@ $$<
1414

1515
endef
1616

‎trunk/mk/perf.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ifdef CFG_PERF_TOOL
33
rustc-perf$(X): stage2/bin/rustc$(X)
44
@$(call E, perf compile: $@)
5-
$(PERF_STAGE1) -L stage2 -o $@ $(COMPILER_CRATE) >rustc-perf.err 2>&1
5+
$(PERF_STAGE1) -o $@ $(COMPILER_CRATE) >rustc-perf.err 2>&1
66
$(Q)rm -f $@
77
else
88
rustc-perf$(X): stage2/bin/rustc$(X)

‎trunk/mk/platform.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ifdef CFG_UNIXY
9898
CFG_EXE_SUFFIX :=
9999
CFG_LDPATH :=
100100
CFG_RUN=$(CFG_LDENV)=$(1) $(2)
101-
CFG_RUN_TARG=$(call CFG_RUN,$(CFG_BUILD_DIR)/$(1)/lib,$(2))
101+
CFG_RUN_TARG=$(call CFG_RUN,$(CFG_BUILD_DIR)/$(HOST_LIB$(1)),$(2))
102102
CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1)),\
103103
$(CFG_VALGRIND) $(1))
104104
CFG_LIBUV_LINK_FLAGS=-lpthread
@@ -139,7 +139,7 @@ ifdef CFG_WINDOWSY
139139
CFG_LDPATH :=$(CFG_LLVM_BINDIR)
140140
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
141141
CFG_RUN=PATH="$(CFG_LDPATH):$(1)" $(2)
142-
CFG_RUN_TARG=$(call CFG_RUN,$(1)/lib,$(2))
142+
CFG_RUN_TARG=$(call CFG_RUN,$(HOST_LIB$(1)),$(2))
143143
CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1)),$(1))
144144
CFG_LIBUV_LINK_FLAGS=-lWs2_32
145145

‎trunk/mk/pp.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ else
1212
"no-reformat\|xfail-pretty\|xfail-test")
1313
endif
1414

15-
reformat: $(SREQ1)
15+
reformat: $(SREQ1$(CFG_HOST_TRIPLE))
1616
@$(call E, reformat [stage1]: $@)
1717
for i in $(PP_INPUTS_FILTERED); \
18-
do $(call CFG_RUN_TARG,stage1,stage1/rustc$(X)) \
18+
do $(call CFG_RUN_TARG,1,stage1/rustc$(X)) \
1919
--pretty normal $$i >$$i.tmp; \
2020
if [ $$? -ne 0 ]; \
2121
then echo failed to print $$i; rm $$i.tmp; \

‎trunk/mk/snap.mk

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11

2-
snap-stage1: stage1/bin/rustc$(X) stage1/lib/$(CFG_RUNTIME) \
3-
stage1/lib/$(CFG_RUSTLLVM) stage1/lib/$(CFG_STDLIB)
2+
snap-stage1: $(HOST_BIN1)/rustc$(X) $(HOST_LIB1)/$(CFG_RUNTIME) \
3+
$(HOST_LIB1)/$(CFG_RUSTLLVM) $(HOST_LIB1)/$(CFG_STDLIB)
44
$(S)src/etc/make-snapshot.py stage1
55

6-
snap-stage2: stage2/bin/rustc$(X) stage2/lib/$(CFG_RUNTIME) \
7-
stage2/lib/$(CFG_RUSTLLVM) stage2/lib/$(CFG_STDLIB)
8-
$(S)src/etc/make-snapshot.py stage2
9-
10-
snap-stage3: stage3/bin/rustc$(X) stage3/lib/$(CFG_RUNTIME) \
11-
stage3/lib/$(CFG_RUSTLLVM) stage3/lib/$(CFG_STDLIB)
12-
$(S)src/etc/make-snapshot.py stage3
6+
snap-stage1: $(HOST_BIN2)/rustc$(X) $(HOST_LIB2)/$(CFG_RUNTIME) \
7+
$(HOST_LIB2)/$(CFG_RUSTLLVM) $(HOST_LIB2)/$(CFG_STDLIB)
8+
$(S)src/etc/make-snapshot.py stage1
139

10+
snap-stage1: $(HOST_BIN3)/rustc$(X) $(HOST_LIB3)/$(CFG_RUNTIME) \
11+
$(HOST_LIB3)/$(CFG_RUSTLLVM) $(HOST_LIB3)/$(CFG_STDLIB)
12+
$(S)src/etc/make-snapshot.py stage1

‎trunk/mk/stage0.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
stage0/bin/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
1+
$(HOST_BIN0)/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
22
@$(call E, fetch: $@)
33
$(Q)$(S)src/etc/get-snapshot.py
44
$(Q)touch $@
55

66
# Host libs will be made in the process of making rustc above.
77

8-
stage0/lib/$(CFG_RUNTIME): stage0/bin/rustc$(X)
8+
$(HOST_LIB0)/$(CFG_RUNTIME): $(HOST_BIN0)/rustc$(X)
99
$(Q)touch $@
1010

11-
stage0/lib/$(CFG_STDLIB): stage0/bin/rustc$(X)
11+
$(HOST_LIB0)/$(CFG_STDLIB): $(HOST_BIN0)/rustc$(X)
1212
$(Q)touch $@
1313

14-
stage0/lib/$(CFG_RUSTLLVM): stage0/bin/rustc$(X)
14+
$(HOST_LIB0)/$(CFG_RUSTLLVM): $(HOST_BIN0)/rustc$(X)
1515
$(Q)touch $@
1616

1717
# Instantiate template (in stageN.mk) for building
1818
# target libraries.
1919

20-
SREQpre = stage0/lib/$(CFG_HOST_TRIPLE)/main.o $(MKFILES)
20+
SREQpre = $(MKFILES)
2121
$(eval $(call TARGET_LIBS,pre,0,$(CFG_HOST_TRIPLE)))
2222

‎trunk/mk/stageN.mk

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,37 @@ define STAGE_N
1919
# for different directories, to handle cases where (say) a test relies on a
2020
# compiler that relies on a .o file.
2121

22-
stage$(2)/bin/%.o: stage$(2)/bin/%.s
22+
$$(HOST_BIN$(2))/%.o: $$(HOST_BIN$(2))/%.s
2323
@$$(call E, assemble [gcc]: $$@)
2424
$$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$<
2525

26-
stage$(2)/lib/%.o: stage$(2)/lib/%.s
26+
$$(HOST_LIB$(2))/%.o: $$(HOST_LIB$(2))/%.s
2727
@$$(call E, assemble [gcc]: $$@)
2828
$$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$<
2929

30-
stage$(2)/bin/rustc$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
31-
stage$(2)/lib/$$(CFG_RUNTIME) \
30+
$$(HOST_BIN$(2))/rustc$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
31+
$$(HOST_LIB$(2))/$$(CFG_RUNTIME) \
3232
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(2)) \
33-
stage$(2)/lib/$$(CFG_RUSTLLVM) \
33+
$$(HOST_LIB$(2))/$$(CFG_RUSTLLVM) \
3434
$$(SREQ$(1)$(3))
3535
@$$(call E, compile_and_link: $$@)
36-
$$(STAGE$(1)) -L stage$(2)/lib -o $$@ $$<
36+
$$(STAGE$(1)) -L $$(HOST_LIB$(2)) -o $$@ $$<
3737

38-
stage$(2)/lib/$$(CFG_LIBRUSTC): \
38+
$$(HOST_LIB$(2))/$$(CFG_LIBRUSTC): \
3939
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
4040
$$(SREQ$(2)$(3))
4141
@$$(call E, compile_and_link: $$@)
42-
$$(STAGE$(1)) -L stage$(2)/lib --lib -o $$@ $$<
42+
$$(STAGE$(1)) -L $$(HOST_LIB$(2)) --lib -o $$@ $$<
4343

44-
stage$(2)/lib/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME)
44+
$$(HOST_LIB$(2))/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME)
4545
@$$(call E, cp: $$@)
4646
$$(Q)cp $$< $$@
4747

48-
stage$(2)/lib/$$(CFG_STDLIB): stage$(1)/lib/rustc/$$(CFG_HOST_TRIPLE)/$$(CFG_STDLIB)
48+
$$(HOST_LIB$(2))/$$(CFG_STDLIB): $$(TARGET_HOST_LIB$(1))/$$(CFG_STDLIB)
4949
@$$(call E, cp: $$@)
5050
$$(Q)cp $$< $$@
5151

52-
stage$(2)/lib/$$(CFG_RUSTLLVM): rustllvm/$$(CFG_RUSTLLVM)
52+
$$(HOST_LIB$(2))/$$(CFG_RUSTLLVM): rustllvm/$$(CFG_RUSTLLVM)
5353
@$$(call E, cp: $$@)
5454
$$(Q)cp $$< $$@
5555

@@ -66,35 +66,35 @@ define TARGET_LIBS
6666
# using these exclusively, you should delete the non-arch-prefixed
6767
# rules above. They're duplicates, redundant.
6868

69-
stage$(2)/lib/rustc/$(3)/intrinsics.bc: $$(INTRINSICS_BC)
69+
$$(TARGET_LIB$(2)$(3))/intrinsics.bc: $$(INTRINSICS_BC)
7070
@$$(call E, cp: $$@)
7171
$$(Q)cp $$< $$@
7272

73-
stage$(2)/lib/rustc/$(3)/main.o: rt/main.o
73+
$$(TARGET_LIB$(2)$(3))/main.o: rt/main.o
7474
@$$(call E, cp: $$@)
7575
$$(Q)cp $$< $$@
7676

77-
stage$(2)/lib/rustc/$(3)/$$(CFG_STDLIB): \
77+
$$(TARGET_LIB$(2)$(3))/$$(CFG_STDLIB): \
7878
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
79-
stage$(2)/bin/rustc$$(X) \
80-
stage$(2)/lib/$$(CFG_RUNTIME) \
81-
stage$(2)/lib/$$(CFG_RUSTLLVM) \
82-
stage$(2)/lib/rustc/$(3)/intrinsics.bc \
79+
$$(HOST_BIN$(2))/rustc$$(X) \
80+
$$(HOST_LIB$(2))/$$(CFG_RUNTIME) \
81+
$$(HOST_LIB$(2))/$$(CFG_RUSTLLVM) \
82+
$$(TARGET_LIB$(2)$(3))/intrinsics.bc \
8383
$$(SREQ$(1)$(3))
8484
@$$(call E, compile_and_link: $$@)
8585
$$(STAGE$(2)) --lib -o $$@ $$<
8686

87-
stage$(2)/lib/rustc/$(3)/libstd.rlib: \
87+
$$(TARGET_LIB$(2)$(3))/libstd.rlib: \
8888
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
89-
stage$(2)/bin/rustc$$(X) \
90-
stage$(2)/lib/$$(CFG_RUNTIME) \
91-
stage$(2)/lib/$$(CFG_RUSTLLVM) \
92-
stage$(2)/lib/rustc/$(3)/intrinsics.bc \
89+
$$(HOST_BIN$(2))/rustc$$(X) \
90+
$$(HOST_LIB$(2))/$$(CFG_RUNTIME) \
91+
$$(HOST_LIB$(2))/$$(CFG_RUSTLLVM) \
92+
$$(TARGET_LIB$(2)$(3))/intrinsics.bc \
9393
$$(SREQ$(1)$(3))
9494
@$$(call E, compile_and_link: $$@)
9595
$$(STAGE$(2)) --lib --static -o $$@ $$<
9696

97-
stage$(2)/lib/rustc/$(3)/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME)
97+
$$(TARGET_LIB$(2)$(3))/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME)
9898
@$$(call E, cp: $$@)
9999
$$(Q)cp $$< $$@
100100

‎trunk/mk/tests.mk

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs)
6868
ifdef CTEST_VALGRIND
6969
CFG_RUN_CTEST=$(call CFG_RUN_TEST,$(2))
7070
else
71-
CFG_RUN_CTEST=$(call CFG_RUN,stage$(1)/lib/rustc/$(CFG_HOST_TRIPLE),$(2))
71+
CFG_RUN_CTEST=$(call CFG_RUN,$(TARGET_HOST_LIB$(1)),$(2))
7272
endif
7373

7474
######################################################################
@@ -146,16 +146,16 @@ test/stdtest.stage$(2).out.tmp: test/stdtest.stage$(2)$$(X)
146146
check-stage$(2)-rustc: test/rustctest.stage$(2).out \
147147

148148
test/rustctest.stage$(2)$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
149-
stage$(2)/lib/$$(CFG_RUNTIME) \
149+
$$(HOST_LIB$(2))/$$(CFG_RUNTIME) \
150150
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(2)) \
151-
stage$(2)/lib/$$(CFG_RUSTLLVM) \
151+
$$(HOST_LIB$(2))/$$(CFG_RUSTLLVM) \
152152
$$(SREQ$(1)$$(CFG_HOST_TRIPLE))
153153
@$$(call E, compile_and_link: $$@)
154154
$$(STAGE$(1)) -o $$@ $$< --test
155155

156156
test/rustctest.stage$(2).out.tmp: test/rustctest.stage$(2)$$(X)
157157
@$$(call E, run: $$<)
158-
$$(Q)$$(call CFG_RUN,$(CFG_BUILD_DIR)/stage$(2)/lib,$$(CFG_VALGRIND) $$<) \
158+
$$(Q)$$(call CFG_RUN,$$(HOST_LIB$(2)),$$(CFG_VALGRIND) $$<) \
159159
$$(TESTARGS)
160160
$$(Q)touch $$@
161161

@@ -185,9 +185,9 @@ check-stage$(2)-pretty: check-stage$(2)-pretty-rpass \
185185
check-stage$(2)-pretty-bench \
186186
check-stage$(2)-pretty-pretty \
187187

188-
CTEST_COMMON_ARGS$(2) := --compile-lib-path stage$(2)/lib \
189-
--run-lib-path stage$(2)/lib/$$(CFG_HOST_TRIPLE) \
190-
--rustc-path stage$(2)/bin/rustc$$(X) \
188+
CTEST_COMMON_ARGS$(2) := --compile-lib-path $$(HOST_LIB$(2)) \
189+
--run-lib-path $$(TARGET_LIB$(2)$$(CFG_HOST_TRIPLE)) \
190+
--rustc-path $$(HOST_BIN$(2))/rustc$$(X) \
191191
--stage-id stage$(2) \
192192
--rustcflags "$$(CFG_RUSTC_FLAGS)" \
193193
$$(CTEST_TESTARGS) \
@@ -204,19 +204,19 @@ RFAIL_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
204204
$$(CTEST_RUNTOOL) \
205205

206206
RPASS_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
207-
--src-base $(S)src/test/run-pass/ \
207+
--src-base $$(S)src/test/run-pass/ \
208208
--build-base test/run-pass/ \
209209
--mode run-pass \
210210
$$(CTEST_RUNTOOL) \
211211

212212
BENCH_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
213-
--src-base $(S)src/test/bench/ \
213+
--src-base $$(S)src/test/bench/ \
214214
--build-base test/bench/ \
215215
--mode run-pass \
216216
$$(CTEST_RUNTOOL) \
217217

218218
PERF_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
219-
--src-base $(S)src/test/bench/ \
219+
--src-base $$(S)src/test/bench/ \
220220
--build-base test/perf/ \
221221
--mode run-pass \
222222
$$(CTEST_PERF_RUNTOOL) \
@@ -324,9 +324,9 @@ stage2/lib/$(FT_LIB): test/$(FT).rc $(SREQ2$(CFG_HOST_TRIPLE))
324324
@$(call E, compile_and_link: $@)
325325
$(STAGE2) --lib -o $@ $<
326326

327-
test/$(FT_DRIVER)$(X): test/$(FT_DRIVER).rs stage2/lib/$(FT_LIB) $(SREQ2$(CFG_HOST_TRIPLE))
327+
test/$(FT_DRIVER)$(X): test/$(FT_DRIVER).rs $(HOST_LIB2)/$(FT_LIB) $(SREQ2$(CFG_HOST_TRIPLE))
328328
@$(call E, compile_and_link: $@)
329-
$(STAGE2) -L stage2/lib -o $@ $<
329+
$(STAGE2) -L $(HOST_LIB2) -o $@ $<
330330

331331
test/$(FT_DRIVER).out: test/$(FT_DRIVER)$(X) $(SREQ2$(CFG_HOST_TRIPLE))
332332
$(Q)$(call CFG_RUN_TEST, $<)

0 commit comments

Comments
 (0)