Skip to content

Commit 0c4f977

Browse files
hirschenbergerhirschenberger
committed
---
yaml --- r: 125883 b: refs/heads/try c: 4ca1277 h: refs/heads/master i: 125881: efc87d0 125879: 1f261af v: v3
1 parent 59fe66f commit 0c4f977

File tree

177 files changed

+10535
-2651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+10535
-2651
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: f2fa55903e378368ed9173560f03a0ef16e371c2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
5-
refs/heads/try: 7ff5bbd494ad40f494bf375451c4be52aa7c9d56
5+
refs/heads/try: 4ca127789d167f5d82c0e76e57649e35216afffc
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,6 @@ opt rpath 0 "build rpaths into rustc itself"
422422
opt nightly 0 "build nightly packages"
423423
opt verify-install 1 "verify installed binaries work"
424424
opt jemalloc 1 "build liballoc with jemalloc"
425-
# This is used by the automation to produce single-target nightlies
426-
opt dist-host-only 0 "only install bins for the host architecture"
427425
valopt prefix "/usr/local" "set installation prefix"
428426
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
429427
valopt llvm-root "" "set LLVM root"

‎branches/try/mk/clean.mk

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
# Cleanup
1313
######################################################################
1414

15-
CLEAN_STAGE_RULES := \
16-
$(foreach stage, $(STAGES), \
17-
$(foreach host, $(CFG_HOST), \
18-
clean$(stage)_H_$(host) \
19-
$(foreach target, $(CFG_TARGET), \
15+
CLEAN_STAGE_RULES := \
16+
$(foreach stage, $(STAGES), \
17+
$(foreach host, $(CFG_HOST), \
18+
clean$(stage)_H_$(host) \
19+
$(foreach target, $(CFG_TARGET), \
2020
clean$(stage)_T_$(target)_H_$(host))))
2121

22-
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
22+
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
2323
$(foreach host, $(CFG_HOST), clean-generic-H-$(host))
2424

25-
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
25+
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
2626
$(foreach host, $(CFG_TARGET), clean-generic-T-$(host))
2727

28-
CLEAN_LLVM_RULES = \
29-
$(foreach target, $(CFG_HOST), \
28+
CLEAN_LLVM_RULES = \
29+
$(foreach target, $(CFG_HOST), \
3030
clean-llvm$(target))
3131

3232
.PHONY: clean clean-all clean-misc clean-llvm
@@ -54,20 +54,20 @@ clean-generic-$(2)-$(1):
5454
$(1)/rt \
5555
$(1)/test \
5656
$(1)/stage* \
57-
-type f \( \
57+
-type f \( \
5858
-name '*.[odasS]' -o \
59-
-name '*.so' -o \
60-
-name '*.dylib' -o \
61-
-name '*.rlib' -o \
62-
-name 'stamp.*' -o \
63-
-name '*.lib' -o \
64-
-name '*.dll' -o \
65-
-name '*.def' -o \
66-
-name '*.bc' \
67-
\) \
59+
-name '*.so' -o \
60+
-name '*.dylib' -o \
61+
-name '*.rlib' -o \
62+
-name 'stamp.*' -o \
63+
-name '*.lib' -o \
64+
-name '*.dll' -o \
65+
-name '*.def' -o \
66+
-name '*.bc' \
67+
\) \
6868
| xargs rm -f
69-
$(Q)find $(1) \
70-
-name '*.dSYM' \
69+
$(Q)find $(1)\
70+
-name '*.dSYM' \
7171
| xargs rm -Rf
7272
endef
7373

@@ -76,8 +76,8 @@ $(foreach targ, $(CFG_TARGET), $(eval $(call CLEAN_GENERIC,$(targ),T)))
7676

7777
define CLEAN_HOST_STAGE_N
7878

79-
clean$(1)_H_$(2): \
80-
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
79+
clean$(1)_H_$(2): \
80+
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
8181
$$(foreach tool,$$(TOOLS),clean$(1)_H_$(2)-tool-$$(tool))
8282
$$(Q)rm -fr $(2)/rt/libbacktrace
8383

@@ -96,8 +96,8 @@ $(foreach host, $(CFG_HOST), \
9696

9797
define CLEAN_TARGET_STAGE_N
9898

99-
clean$(1)_T_$(2)_H_$(3): \
100-
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
99+
clean$(1)_T_$(2)_H_$(3): \
100+
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
101101
$$(foreach tool,$$(TOOLS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
102102
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
103103
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a

‎branches/try/mk/ctags.mk

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
# This is using a blacklist approach, probably more durable than a whitelist.
1919
# We exclude: external dependencies (llvm, libuv, gyp, rt/{msvc,sundown,vg}),
2020
# tests (compiletest, test) and a couple of other things (rt/arch, etc)
21-
CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,, \
22-
$(patsubst ${CFG_SRC_DIR}src/libuv,, \
23-
$(patsubst ${CFG_SRC_DIR}src/compiletest,, \
24-
$(patsubst ${CFG_SRC_DIR}src/test,, \
25-
$(patsubst ${CFG_SRC_DIR}src/gyp,, \
26-
$(patsubst ${CFG_SRC_DIR}src/etc,, \
27-
$(patsubst ${CFG_SRC_DIR}src/rt,, \
28-
$(patsubst ${CFG_SRC_DIR}src/rt/arch,, \
29-
$(patsubst ${CFG_SRC_DIR}src/rt/msvc,, \
30-
$(patsubst ${CFG_SRC_DIR}src/rt/sundown,, \
31-
$(patsubst ${CFG_SRC_DIR}src/rt/vg,, \
32-
$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*) \
21+
CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,,\
22+
$(patsubst ${CFG_SRC_DIR}src/libuv,,\
23+
$(patsubst ${CFG_SRC_DIR}src/compiletest,,\
24+
$(patsubst ${CFG_SRC_DIR}src/test,,\
25+
$(patsubst ${CFG_SRC_DIR}src/gyp,,\
26+
$(patsubst ${CFG_SRC_DIR}src/etc,,\
27+
$(patsubst ${CFG_SRC_DIR}src/rt,,\
28+
$(patsubst ${CFG_SRC_DIR}src/rt/arch,,\
29+
$(patsubst ${CFG_SRC_DIR}src/rt/msvc,,\
30+
$(patsubst ${CFG_SRC_DIR}src/rt/sundown,,\
31+
$(patsubst ${CFG_SRC_DIR}src/rt/vg,,\
32+
$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*)\
3333
)))))))))))
3434
CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=-javascript --recurse ${CTAGS_LOCATIONS}
3535
# We could use `--languages=Rust`, but there is value in producing tags for the

‎branches/try/mk/dist.mk

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ define DEF_OSX_PKG
156156
$$(eval $$(call DEF_PREPARE,osx-$(1)))
157157

158158
dist-prepare-osx-$(1): PREPARE_HOST=$(1)
159-
dist-prepare-osx-$(1): PREPARE_TARGETS=$(2)
159+
dist-prepare-osx-$(1): PREPARE_TARGETS=$(1)
160160
dist-prepare-osx-$(1): PREPARE_DEST_DIR=tmp/dist/pkgroot-$(1)
161161
dist-prepare-osx-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
162162
dist-prepare-osx-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
@@ -187,11 +187,7 @@ tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/%
187187

188188
endef
189189

190-
ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
191-
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(host))))
192-
else
193-
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(TARGET))))
194-
endif
190+
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))
195191

196192
dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg)
197193

@@ -209,19 +205,17 @@ distcheck-osx: dist-osx
209205
# Unix binary installer tarballs
210206
######################################################################
211207

212-
define DEF_INSTALLER
213-
214-
$$(eval $$(call DEF_PREPARE,dir-$(1)))
215-
216-
dist-install-dir-$(1): PREPARE_HOST=$(1)
217-
dist-install-dir-$(1): PREPARE_TARGETS=$(2)
218-
dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
219-
dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
220-
dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
221-
dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
222-
dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
223-
dist-install-dir-$(1): PREPARE_CLEAN=true
224-
dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
208+
define DEF_PREPARE_DIST_DIR
209+
210+
dist-install-dir-$(1)$(3): PREPARE_HOST=$(1)
211+
dist-install-dir-$(1)$(3): PREPARE_TARGETS=$(2)
212+
dist-install-dir-$(1)$(3): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
213+
dist-install-dir-$(1)$(3): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
214+
dist-install-dir-$(1)$(3): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
215+
dist-install-dir-$(1)$(3): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
216+
dist-install-dir-$(1)$(3): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
217+
dist-install-dir-$(1)$(3): PREPARE_CLEAN=true
218+
dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs
225219
$$(Q)(cd $$(PREPARE_DEST_DIR)/ && find . -type f | sed 's/^\.\///') \
226220
> tmp/dist/manifest-$(1).in
227221
$$(Q)mv tmp/dist/manifest-$(1).in $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/rustlib/manifest.in
@@ -233,19 +227,24 @@ dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
233227
$$(Q)cp -r doc $$(PREPARE_DEST_DIR)
234228
$$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR)
235229

230+
endef
231+
232+
define DEF_INSTALLER
233+
234+
$$(eval $$(call DEF_PREPARE,dir-$(1)))
235+
236+
$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(1),))
237+
238+
$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(CFG_TARGET),-with-target-libs))
239+
236240
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
237241
@$(call E, build: $$@)
238242
$$(Q)tar -czf dist/$$(PKG_NAME)-$(1).tar.gz -C tmp/dist $$(PKG_NAME)-$(1)
239243

240244
endef
241245

242-
ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
243-
$(foreach host,$(CFG_HOST),\
244-
$(eval $(call DEF_INSTALLER,$(host),$(host))))
245-
else
246246
$(foreach host,$(CFG_HOST),\
247-
$(eval $(call DEF_INSTALLER,$(host),$(CFG_TARGET))))
248-
endif
247+
$(eval $(call DEF_INSTALLER,$(host))))
249248

250249
dist-install-dirs: $(foreach host,$(CFG_HOST),dist-install-dir-$(host))
251250

‎branches/try/mk/docs.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ HTML_DEPS += doc/version_info.html
112112
doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
113113
$(wildcard $(D)/*.*) | doc/
114114
@$(call E, version-info: $@)
115-
$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$( \
116-
CFG_SHORT_VER_HASH)/; \
115+
$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(\
116+
CFG_SHORT_VER_HASH)/;\
117117
s/STAMP/$(CFG_VER_HASH)/;" $< >$@
118118

119119
GENERATED += doc/version.tex doc/version_info.html

‎branches/try/mk/host.mk

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
define CP_HOST_STAGE_N_CRATE
2020

2121
ifeq ($$(ONLY_RLIB_$(5)),)
22-
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
23-
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
24-
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
22+
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
23+
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
24+
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
2525
| $$(HLIB$(2)_H_$(4))/
2626
@$$(call E, cp: $$(@D)/lib$(5))
27-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
27+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
2828
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
2929
$$(Q)cp $$< $$@
3030
$$(Q)cp -R $$(TLIB$(1)_T_$(3)_H_$(4))/$$(call CFG_LIB_GLOB_$(3),$(5)) \
3131
$$(HLIB$(2)_H_$(4))
32-
$$(call LIST_ALL_OLD_GLOB_MATCHES, \
32+
$$(call LIST_ALL_OLD_GLOB_MATCHES,\
3333
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
3434
else
3535
$$(HLIB$(2)_H_$(4))/stamp.$(5):
@@ -66,19 +66,19 @@ endif
6666

6767
endef
6868

69-
$(foreach t,$(CFG_HOST), \
70-
$(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t))) \
71-
$(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t))) \
69+
$(foreach t,$(CFG_HOST), \
70+
$(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t))) \
71+
$(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t))) \
7272
$(eval $(call CP_HOST_STAGE_N,2,3,$(t),$(t))))
7373

74-
$(foreach crate,$(CRATES), \
75-
$(foreach t,$(CFG_HOST), \
76-
$(eval $(call CP_HOST_STAGE_N_CRATE,0,1,$(t),$(t),$(crate))) \
77-
$(eval $(call CP_HOST_STAGE_N_CRATE,1,2,$(t),$(t),$(crate))) \
74+
$(foreach crate,$(CRATES), \
75+
$(foreach t,$(CFG_HOST), \
76+
$(eval $(call CP_HOST_STAGE_N_CRATE,0,1,$(t),$(t),$(crate))) \
77+
$(eval $(call CP_HOST_STAGE_N_CRATE,1,2,$(t),$(t),$(crate))) \
7878
$(eval $(call CP_HOST_STAGE_N_CRATE,2,3,$(t),$(t),$(crate)))))
7979

80-
$(foreach tool,$(TOOLS), \
81-
$(foreach t,$(CFG_HOST), \
82-
$(eval $(call CP_HOST_STAGE_N_TOOL,0,1,$(t),$(t),$(tool))) \
83-
$(eval $(call CP_HOST_STAGE_N_TOOL,1,2,$(t),$(t),$(tool))) \
80+
$(foreach tool,$(TOOLS), \
81+
$(foreach t,$(CFG_HOST), \
82+
$(eval $(call CP_HOST_STAGE_N_TOOL,0,1,$(t),$(t),$(tool))) \
83+
$(eval $(call CP_HOST_STAGE_N_TOOL,1,2,$(t),$(t),$(tool))) \
8484
$(eval $(call CP_HOST_STAGE_N_TOOL,2,3,$(t),$(t),$(tool)))))

‎branches/try/mk/install.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ else
1414
MAYBE_DISABLE_VERIFY=
1515
endif
1616

17-
install: dist-install-dir-$(CFG_BUILD) | tmp/empty_dir
17+
install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
1818
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
1919
# Remove tmp files while we can because they may have been created under sudo
2020
$(Q)rm -R tmp/dist
2121

22-
uninstall: dist-install-dir-$(CFG_BUILD) | tmp/empty_dir
22+
uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
2323
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
2424
# Remove tmp files while we can because they may have been created under sudo
2525
$(Q)rm -R tmp/dist
@@ -81,15 +81,15 @@ endif
8181
define INSTALL_RUNTIME_TARGET_N
8282
install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
8383
$$(Q)$$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR))
84-
$$(Q)$$(foreach crate,$$(TARGET_CRATES), \
85-
$$(call ADB_PUSH,$$(TL$(1)$(2))/$$(call CFG_LIB_GLOB_$(1),$$(crate)), \
84+
$$(Q)$$(foreach crate,$$(TARGET_CRATES),\
85+
$$(call ADB_PUSH,$$(TL$(1)$(2))/$$(call CFG_LIB_GLOB_$(1),$$(crate)),\
8686
$$(CFG_RUNTIME_PUSH_DIR));)
8787
endef
8888

8989
define INSTALL_RUNTIME_TARGET_CLEANUP_N
9090
install-runtime-target-$(1)-cleanup:
9191
$$(Q)$$(call ADB,remount)
92-
$$(Q)$$(foreach crate,$$(TARGET_CRATES), \
92+
$$(Q)$$(foreach crate,$$(TARGET_CRATES),\
9393
$$(call ADB_SHELL,rm,$$(CFG_RUNTIME_PUSH_DIR)/$$(call CFG_LIB_GLOB_$(1),$$(crate)));)
9494
endef
9595

‎branches/try/mk/main.mk

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ endif
167167
define DEF_X
168168
X_$(1) := $(CFG_EXE_SUFFIX_$(1))
169169
endef
170-
$(foreach target,$(CFG_TARGET), \
170+
$(foreach target,$(CFG_TARGET),\
171171
$(eval $(call DEF_X,$(target))))
172172

173173
# "Source" files we generate in builddir along the way.
@@ -333,7 +333,7 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
333333
# target
334334
SREQ$(1)_T_$(2)_H_$(3) = \
335335
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
336-
$$(foreach dep,$$(TARGET_CRATES), \
336+
$$(foreach dep,$$(TARGET_CRATES),\
337337
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep))
338338

339339
# Prerequisites for a working stageN compiler and complete set of target
@@ -416,20 +416,20 @@ RPATH_VAR$(1)_T_$(2)_H_$(3) := $$(TARGET_RPATH_VAR$(1)_T_$(2)_H_$(3))
416416
endif
417417
endif
418418

419-
STAGE$(1)_T_$(2)_H_$(3) := \
420-
$$(Q)$$(RPATH_VAR$(1)_T_$(2)_H_$(3)) \
421-
$$(call CFG_RUN_TARG_$(3),$(1), \
422-
$$(CFG_VALGRIND_COMPILE$(1)) \
423-
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
424-
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
419+
STAGE$(1)_T_$(2)_H_$(3) := \
420+
$$(Q)$$(RPATH_VAR$(1)_T_$(2)_H_$(3)) \
421+
$$(call CFG_RUN_TARG_$(3),$(1), \
422+
$$(CFG_VALGRIND_COMPILE$(1)) \
423+
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
424+
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
425425
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
426426
$$(RUSTC_FLAGS_$(2))
427427

428-
PERF_STAGE$(1)_T_$(2)_H_$(3) := \
429-
$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
430-
$$(CFG_PERF_TOOL) \
431-
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
432-
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
428+
PERF_STAGE$(1)_T_$(2)_H_$(3) := \
429+
$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
430+
$$(CFG_PERF_TOOL) \
431+
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
432+
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
433433
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
434434
$$(RUSTC_FLAGS_$(2))
435435

@@ -455,13 +455,13 @@ define DEF_RUSTC_STAGE_TARGET
455455
# $(1) == architecture
456456
# $(2) == stage
457457

458-
rustc-stage$(2)-H-$(1): \
458+
rustc-stage$(2)-H-$(1): \
459459
$$(foreach target,$$(CFG_TARGET),$$(SREQ$(2)_T_$$(target)_H_$(1)))
460460

461461
endef
462462

463-
$(foreach host,$(CFG_HOST), \
464-
$(eval $(foreach stage,1 2 3, \
463+
$(foreach host,$(CFG_HOST), \
464+
$(eval $(foreach stage,1 2 3, \
465465
$(eval $(call DEF_RUSTC_STAGE_TARGET,$(host),$(stage))))))
466466

467467
rustc-stage1: rustc-stage1-H-$(CFG_BUILD)
@@ -474,7 +474,7 @@ define DEF_RUSTC_TARGET
474474
rustc-H-$(1): rustc-stage2-H-$(1)
475475
endef
476476

477-
$(foreach host,$(CFG_TARGET), \
477+
$(foreach host,$(CFG_TARGET), \
478478
$(eval $(call DEF_RUSTC_TARGET,$(host))))
479479

480480
rustc-stage1: rustc-stage1-H-$(CFG_BUILD)

0 commit comments

Comments
 (0)