Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8a593a8

Browse files
cndbrson
cnd
authored and
brson
committedOct 29, 2013
support for GNU configure syntax
1 parent 611c94d commit 8a593a8

File tree

19 files changed

+247
-218
lines changed

19 files changed

+247
-218
lines changed
 

‎Makefile.in

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@ include config.mk
7070
ALL_OBJ_FILES :=
7171

7272
MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*)
73-
NON_BUILD_HOST_TRIPLES = $(filter-out $(CFG_BUILD_TRIPLE),$(CFG_HOST_TRIPLES))
74-
NON_BUILD_TARGET_TRIPLES = $(filter-out $(CFG_BUILD_TRIPLE),$(CFG_TARGET_TRIPLES))
73+
NON_BUILD_HOST = $(filter-out $(CFG_BUILD),$(CFG_HOST))
74+
NON_BUILD_TARGET = $(filter-out $(CFG_BUILD),$(CFG_TARGET))
7575

7676
ifneq ($(MAKE_RESTARTS),)
7777
CFG_INFO := $(info cfg: make restarts: $(MAKE_RESTARTS))
7878
endif
7979

80-
CFG_INFO := $(info cfg: build triple $(CFG_BUILD_TRIPLE))
81-
CFG_INFO := $(info cfg: host triples $(CFG_HOST_TRIPLES))
82-
CFG_INFO := $(info cfg: target triples $(CFG_TARGET_TRIPLES))
80+
CFG_INFO := $(info cfg: build triple $(CFG_BUILD))
81+
CFG_INFO := $(info cfg: host triples $(CFG_HOST))
82+
CFG_INFO := $(info cfg: target triples $(CFG_TARGET))
8383

84-
ifneq ($(wildcard $(NON_BUILD_HOST_TRIPLES)),)
85-
CFG_INFO := $(info cfg: non-build host triples $(NON_BUILD_HOST_TRIPLES))
84+
ifneq ($(wildcard $(NON_BUILD_HOST)),)
85+
CFG_INFO := $(info cfg: non-build host triples $(NON_BUILD_HOST))
8686
endif
87-
ifneq ($(wildcard $(NON_BUILD_TARGET_TRIPLES)),)
88-
CFG_INFO := $(info cfg: non-build target triples $(NON_BUILD_TARGET_TRIPLES))
87+
ifneq ($(wildcard $(NON_BUILD_TARGET)),)
88+
CFG_INFO := $(info cfg: non-build target triples $(NON_BUILD_TARGET))
8989
endif
9090

9191
CFG_RUSTC_FLAGS := $(RUSTFLAGS)
@@ -189,7 +189,7 @@ S := $(CFG_SRC_DIR)
189189
define DEF_X
190190
X_$(1) := $(CFG_EXE_SUFFIX_$(1))
191191
endef
192-
$(foreach target,$(CFG_TARGET_TRIPLES),\
192+
$(foreach target,$(CFG_TARGET),\
193193
$(eval $(call DEF_X,$(target))))
194194

195195
# Look in doc and src dirs.
@@ -273,7 +273,7 @@ define LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
273273
endef
274274
endif
275275

276-
$(foreach target,$(CFG_TARGET_TRIPLES),\
276+
$(foreach target,$(CFG_TARGET),\
277277
$(eval $(call DEF_LIBS,$(target))))
278278

279279
######################################################################
@@ -347,7 +347,7 @@ LLC_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llc$$(X_$(1))
347347

348348
endef
349349

350-
$(foreach host,$(CFG_HOST_TRIPLES), \
350+
$(foreach host,$(CFG_HOST), \
351351
$(eval $(call DEF_LLVM_VARS,$(host))))
352352

353353
######################################################################
@@ -361,7 +361,7 @@ export CFG_SRC_DIR
361361
export CFG_BUILD_DIR
362362
export CFG_VERSION
363363
export CFG_VERSION_WIN
364-
export CFG_BUILD_TRIPLE
364+
export CFG_BUILD
365365
export CFG_LLVM_ROOT
366366
export CFG_ENABLE_MINGW_CROSS
367367
export CFG_PREFIX
@@ -484,7 +484,7 @@ CFGFLAG$(1)_T_$(2)_H_$(3) = stage$(1)
484484
# if you're building a cross config, the host->* parts are
485485
# effectively stage1, since it uses the just-built stage0.
486486
ifeq ($(1),0)
487-
ifneq ($(strip $(CFG_BUILD_TRIPLE)),$(strip $(3)))
487+
ifneq ($(strip $(CFG_BUILD)),$(strip $(3)))
488488
CFGFLAG$(1)_T_$(2)_H_$(3) = stage1
489489
endif
490490
endif
@@ -507,8 +507,8 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
507507

508508
endef
509509

510-
$(foreach build,$(CFG_HOST_TRIPLES), \
511-
$(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
510+
$(foreach build,$(CFG_HOST), \
511+
$(eval $(foreach target,$(CFG_TARGET), \
512512
$(eval $(foreach stage,$(STAGES), \
513513
$(eval $(call SREQ,$(stage),$(target),$(build))))))))
514514

@@ -523,34 +523,34 @@ define DEF_RUSTC_STAGE_TARGET
523523
# $(2) == stage
524524

525525
rustc-stage$(2)-H-$(1): \
526-
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
526+
$$(foreach target,$$(CFG_TARGET), \
527527
$$(SREQ$(2)_T_$$(target)_H_$(1)))
528528

529529
endef
530530

531-
$(foreach host,$(CFG_HOST_TRIPLES), \
531+
$(foreach host,$(CFG_HOST), \
532532
$(eval $(foreach stage,1 2 3, \
533533
$(eval $(call DEF_RUSTC_STAGE_TARGET,$(host),$(stage))))))
534534

535-
rustc-stage1: rustc-stage1-H-$(CFG_BUILD_TRIPLE)
536-
rustc-stage2: rustc-stage2-H-$(CFG_BUILD_TRIPLE)
537-
rustc-stage3: rustc-stage3-H-$(CFG_BUILD_TRIPLE)
535+
rustc-stage1: rustc-stage1-H-$(CFG_BUILD)
536+
rustc-stage2: rustc-stage2-H-$(CFG_BUILD)
537+
rustc-stage3: rustc-stage3-H-$(CFG_BUILD)
538538

539539
define DEF_RUSTC_TARGET
540540
# $(1) == architecture
541541

542542
rustc-H-$(1): rustc-stage2-H-$(1)
543543
endef
544544

545-
$(foreach host,$(CFG_TARGET_TRIPLES), \
545+
$(foreach host,$(CFG_TARGET), \
546546
$(eval $(call DEF_RUSTC_TARGET,$(host))))
547547

548-
rustc-stage1: rustc-stage1-H-$(CFG_BUILD_TRIPLE)
549-
rustc-stage2: rustc-stage2-H-$(CFG_BUILD_TRIPLE)
550-
rustc-stage3: rustc-stage3-H-$(CFG_BUILD_TRIPLE)
551-
rustc: rustc-H-$(CFG_BUILD_TRIPLE)
548+
rustc-stage1: rustc-stage1-H-$(CFG_BUILD)
549+
rustc-stage2: rustc-stage2-H-$(CFG_BUILD)
550+
rustc-stage3: rustc-stage3-H-$(CFG_BUILD)
551+
rustc: rustc-H-$(CFG_BUILD)
552552

553-
rustc-H-all: $(foreach host,$(CFG_HOST_TRIPLES),rustc-H-$(host))
553+
rustc-H-all: $(foreach host,$(CFG_HOST),rustc-H-$(host))
554554

555555
######################################################################
556556
# Entrypoint rule
@@ -566,12 +566,12 @@ CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
566566
CFG_INFO := $(info cfg:)
567567

568568
#XXX This is surely busted
569-
all: $(SREQ1$(CFG_BUILD_TRIPLE)) $(GENERATED) docs
569+
all: $(SREQ1$(CFG_BUILD)) $(GENERATED) docs
570570

571571
else
572572

573573
define ALL_TARGET_N
574-
ifneq ($$(findstring $(1),$$(CFG_HOST_TRIPLES)),)
574+
ifneq ($$(findstring $(1),$$(CFG_HOST)),)
575575
# This is a host
576576
all-target-$(1)-host-$(2): $$(CSREQ2_T_$(1)_H_$(2))
577577
else
@@ -580,12 +580,12 @@ all-target-$(1)-host-$(2): $$(SREQ2_T_$(1)_H_$(2))
580580
endif
581581
endef
582582

583-
$(foreach target,$(CFG_TARGET_TRIPLES), \
584-
$(foreach host,$(CFG_HOST_TRIPLES), \
583+
$(foreach target,$(CFG_TARGET), \
584+
$(foreach host,$(CFG_HOST), \
585585
$(eval $(call ALL_TARGET_N,$(target),$(host)))))
586586

587-
ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
588-
$(foreach host,$(CFG_HOST_TRIPLES), \
587+
ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET), \
588+
$(foreach host,$(CFG_HOST), \
589589
all-target-$(target)-host-$(host)))
590590

591591
all: $(ALL_TARGET_RULES) $(GENERATED) docs

‎configure

Lines changed: 50 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ then
336336
fi
337337

338338

339-
DEFAULT_BUILD_TRIPLE="${CFG_CPUTYPE}-${CFG_OSTYPE}"
339+
DEFAULT_BUILD="${CFG_CPUTYPE}-${CFG_OSTYPE}"
340340

341341
CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
342342
CFG_BUILD_DIR="$(pwd)/"
@@ -385,12 +385,25 @@ opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-
385385
valopt prefix "/usr/local" "set installation prefix"
386386
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
387387
valopt llvm-root "" "set LLVM root"
388-
valopt build-triple "${DEFAULT_BUILD_TRIPLE}" "LLVM build triple"
389-
valopt host-triples "${CFG_BUILD_TRIPLE}" "LLVM host triples"
390-
valopt target-triples "${CFG_HOST_TRIPLES}" "LLVM target triples"
391388
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
392389
valopt mingw32-cross-path "" "MinGW32 cross compiler path"
393390

391+
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
392+
valopt host "${CFG_BUILD}" "GNUs ./configure syntax LLVM host triples"
393+
valopt target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
394+
395+
valopt localstatedir "/var/lib" "local state directory"
396+
valopt sysconfdir "/etc" "install system configuration files"
397+
valopt datadir "/usr/share" "install data"
398+
valopt infodir "/usr/share/info" "install additional info"
399+
valopt mandir "/usr/share/man" "install man pages in PATH"
400+
valopt libdir "/usr/lib" "install libraries"
401+
402+
#Deprecated opts to keep compatibility
403+
valopt build-triple "${DEFAULT_BUILD}" "LLVM build triple"
404+
valopt host-triples "${CFG_BUILD}" "LLVM host triples"
405+
valopt target-triples "${CFG_HOST}" "LLVM target triples"
406+
394407
# Validate Options
395408
step_msg "validating $CFG_SELF args"
396409
validate_opt
@@ -589,23 +602,24 @@ fi
589602
# a little post-processing of various config values
590603

591604
CFG_PREFIX=${CFG_PREFIX%/}
592-
CFG_HOST_TRIPLES="$(echo $CFG_HOST_TRIPLES | tr ',' ' ')"
593-
CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
594-
CFG_SUPPORTED_TARGET_TRIPLES="$(grep ^CC_*=* $CFG_SRC_DIR/mk/platform.mk | sed -e 's/^CC_//' -e 's/\([^=]*\).*/\1/' | xargs)"
605+
CFG_MANDIR=${CFG_MANDIR%/}
606+
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
607+
CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
608+
CFG_SUPPORTED_TARGET="$(grep ^CC_*=* $CFG_SRC_DIR/mk/platform.mk | sed -e 's/^CC_//' -e 's/\([^=]*\).*/\1/' | xargs)"
595609

596610
# copy host-triples to target-triples so that hosts are a subset of targets
597611
V_TEMP=""
598-
for i in $CFG_HOST_TRIPLES $CFG_TARGET_TRIPLES;
612+
for i in $CFG_HOST $CFG_TARGET;
599613
do
600614
echo "$V_TEMP" | grep -qF $i || V_TEMP="$V_TEMP${V_TEMP:+ }$i"
601615
done
602-
CFG_TARGET_TRIPLES=$V_TEMP
616+
CFG_TARGET=$V_TEMP
603617

604618
# check target-specific tool-chains
605-
for i in $CFG_TARGET_TRIPLES
619+
for i in $CFG_TARGET
606620
do
607621
L_CHECK=false
608-
for j in $CFG_SUPPORTED_TARGET_TRIPLES
622+
for j in $CFG_SUPPORTED_TARGET
609623
do
610624
if [ $i = $j ]
611625
then
@@ -664,17 +678,17 @@ do
664678
make_dir $i
665679
done
666680

667-
for t in $CFG_HOST_TRIPLES
681+
for t in $CFG_HOST
668682
do
669683
make_dir $t/llvm
670684
done
671685

672-
for t in $CFG_HOST_TRIPLES
686+
for t in $CFG_HOST
673687
do
674688
make_dir $t/rustllvm
675689
done
676690

677-
for t in $CFG_TARGET_TRIPLES
691+
for t in $CFG_TARGET
678692
do
679693
make_dir $t/rt
680694
for s in 0 1 2 3
@@ -703,9 +717,9 @@ then
703717
CFG_LIBDIR=bin
704718
fi
705719

706-
for h in $CFG_HOST_TRIPLES
720+
for h in $CFG_HOST_
707721
do
708-
for t in $CFG_TARGET_TRIPLES
722+
for t in $CFG_TARGET
709723
do
710724
for i in 0 1 2 3
711725
do
@@ -785,7 +799,7 @@ fi
785799
# Configure llvm, only if necessary
786800
step_msg "looking at LLVM"
787801
CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/
788-
for t in $CFG_HOST_TRIPLES
802+
for t in $CFG_HOST
789803
do
790804
do_reconfigure=1
791805

@@ -961,14 +975,29 @@ putvar CFG_OSTYPE
961975
putvar CFG_CPUTYPE
962976
putvar CFG_CONFIGURE_ARGS
963977
putvar CFG_PREFIX
964-
putvar CFG_BUILD_TRIPLE
965-
putvar CFG_HOST_TRIPLES
966-
putvar CFG_TARGET_TRIPLES
978+
putvar CFG_BUILD
979+
putvar CFG_HOST
980+
putvar CFG_TARGET
967981
putvar CFG_C_COMPILER
968982
putvar CFG_LIBDIR
969983
putvar CFG_DISABLE_MANAGE_SUBMODULES
970984
putvar CFG_ANDROID_CROSS_PATH
971985
putvar CFG_MINGW32_CROSS_PATH
986+
putvar CFG_MANDIR
987+
988+
# Support for deprecated syntax, should be dropped.
989+
putvar CFG_BUILD_TRIPLE
990+
putvar CFG_HOST_TRIPLES
991+
putvar CFG_TARGET_TRIPLES
992+
if [ ! -z "$CFG_BUILD_TRIPLE" ]; then
993+
CFG_BUILD=${CFG_BUILD_TRIPLE}
994+
fi
995+
if [ ! -z "$CFG_HOST_TRIPLES" ]; then
996+
CFG_HOST=${CFG_HOST_TRIPLES}
997+
fi
998+
if [ ! -z "$CFG_TARGET_TRIPLES" ]; then
999+
CFG_TARGET=${CFG_TARGET_TRIPLES}
1000+
fi
9721001

9731002
if [ ! -z "$CFG_ENABLE_PAX_FLAGS" ]
9741003
then
@@ -1015,7 +1044,7 @@ fi
10151044
putvar CFG_LLVM_ROOT
10161045
putvar CFG_LLVM_SRC_DIR
10171046

1018-
for t in $CFG_HOST_TRIPLES
1047+
for t in $CFG_HOST
10191048
do
10201049
CFG_LLVM_BUILD_DIR=$(echo CFG_LLVM_BUILD_DIR_${t} | tr - _)
10211050
CFG_LLVM_INST_DIR=$(echo CFG_LLVM_INST_DIR_${t} | tr - _)

‎mk/clean.mk

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
CLEAN_STAGE_RULES = \
1616
$(foreach stage, $(STAGES), \
17-
$(foreach host, $(CFG_HOST_TRIPLES), \
17+
$(foreach host, $(CFG_HOST), \
1818
clean$(stage)_H_$(host) \
19-
$(foreach target, $(CFG_TARGET_TRIPLES), \
19+
$(foreach target, $(CFG_TARGET), \
2020
clean$(stage)_T_$(target)_H_$(host))))
2121

2222
CLEAN_LLVM_RULES = \
23-
$(foreach target, $(CFG_HOST_TRIPLES), \
23+
$(foreach target, $(CFG_HOST), \
2424
clean-llvm$(target))
2525

2626
.PHONY: clean clean-all clean-misc clean-llvm
@@ -33,17 +33,17 @@ clean: clean-misc $(CLEAN_STAGE_RULES)
3333

3434
clean-misc:
3535
@$(call E, cleaning)
36-
$(Q)find $(CFG_BUILD_TRIPLE)/rustllvm \
37-
$(CFG_BUILD_TRIPLE)/rt \
38-
$(CFG_BUILD_TRIPLE)/test \
36+
$(Q)find $(CFG_BUILD)/rustllvm \
37+
$(CFG_BUILD)/rt \
38+
$(CFG_BUILD)/test \
3939
-name '*.[odasS]' -o \
4040
-name '*.so' -o \
4141
-name '*.dylib' -o \
4242
-name '*.dll' -o \
4343
-name '*.def' -o \
4444
-name '*.bc' \
4545
| xargs rm -f
46-
$(Q)find $(CFG_BUILD_TRIPLE)\
46+
$(Q)find $(CFG_BUILD)\
4747
-name '*.dSYM' \
4848
| xargs rm -Rf
4949
$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)
@@ -87,7 +87,7 @@ clean$(1)_H_$(2):
8787

8888
endef
8989

90-
$(foreach host, $(CFG_HOST_TRIPLES), \
90+
$(foreach host, $(CFG_HOST), \
9191
$(eval $(foreach stage, $(STAGES), \
9292
$(eval $(call CLEAN_HOST_STAGE_N,$(stage),$(host))))))
9393

@@ -121,8 +121,8 @@ clean$(1)_T_$(2)_H_$(3):
121121
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/run_pass_stage* # For windows
122122
endef
123123

124-
$(foreach host, $(CFG_HOST_TRIPLES), \
125-
$(eval $(foreach target, $(CFG_TARGET_TRIPLES), \
124+
$(foreach host, $(CFG_HOST), \
125+
$(eval $(foreach target, $(CFG_TARGET), \
126126
$(eval $(foreach stage, 0 1 2 3, \
127127
$(eval $(call CLEAN_TARGET_STAGE_N,$(stage),$(target),$(host))))))))
128128

@@ -136,5 +136,5 @@ clean-llvm$(1): ;
136136
endif
137137
endef
138138

139-
$(foreach host, $(CFG_HOST_TRIPLES), \
139+
$(foreach host, $(CFG_HOST), \
140140
$(eval $(call DEF_CLEAN_LLVM_HOST,$(host))))

‎mk/dist.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
5757
cp $< $@
5858

5959
$(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
60-
$(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
60+
$(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD))
6161
$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py i686-pc-mingw32/stage3/bin
6262
@$(call E, ISCC: $@)
6363
$(Q)"$(CFG_ISCC)" $<
@@ -84,7 +84,7 @@ $(PKG_TAR): $(PKG_FILES)
8484

8585
.PHONY: dist distcheck
8686

87-
ifdef CFG_WINDOWSY_$(CFG_BUILD_TRIPLE)
87+
ifdef CFG_WINDOWSY_$(CFG_BUILD)
8888

8989
dist: $(PKG_EXE)
9090

‎mk/docs.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ endif
235235
######################################################################
236236

237237
# The rustdoc executable
238-
RUSTDOC = $(HBIN2_H_$(CFG_BUILD_TRIPLE))/rustdoc$(X_$(CFG_BUILD_TRIPLE))
238+
RUSTDOC = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
239239

240240
# The library documenting macro
241241
# $(1) - The crate name (std/extra)
@@ -249,8 +249,8 @@ doc/$(1)/index.html: $$(RUSTDOC) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3))
249249
DOCS += doc/$(1)/index.html
250250
endef
251251

252-
$(eval $(call libdoc,std,$(STDLIB_CRATE),$(CFG_BUILD_TRIPLE)))
253-
$(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(CFG_BUILD_TRIPLE)))
252+
$(eval $(call libdoc,std,$(STDLIB_CRATE),$(CFG_BUILD)))
253+
$(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(CFG_BUILD)))
254254

255255

256256
ifdef CFG_DISABLE_DOCS

‎mk/host.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ endif
161161

162162
endef
163163

164-
$(foreach t,$(CFG_HOST_TRIPLES), \
164+
$(foreach t,$(CFG_HOST), \
165165
$(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t))) \
166166
$(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t))) \
167167
$(eval $(call CP_HOST_STAGE_N,2,3,$(t),$(t))))

‎mk/install.mk

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ PTL$(1)$(2) = $$(PTR$(1)$(2))/$(CFG_LIBDIR)
8080

8181
endef
8282

83-
$(foreach target,$(CFG_TARGET_TRIPLES), \
84-
$(eval $(call INSTALL_PREPARE_N,$(target),$(CFG_BUILD_TRIPLE))))
83+
$(foreach target,$(CFG_TARGET), \
84+
$(eval $(call INSTALL_PREPARE_N,$(target),$(CFG_BUILD))))
8585

8686
define INSTALL_TARGET_N
8787
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
@@ -114,44 +114,44 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
114114

115115
endef
116116

117-
$(foreach target,$(CFG_TARGET_TRIPLES), \
118-
$(if $(findstring $(target), $(CFG_BUILD_TRIPLE)), \
119-
$(eval $(call INSTALL_HOST_N,$(target),$(CFG_BUILD_TRIPLE))), \
120-
$(eval $(call INSTALL_TARGET_N,$(target),$(CFG_BUILD_TRIPLE)))))
117+
$(foreach target,$(CFG_TARGET), \
118+
$(if $(findstring $(target), $(CFG_BUILD)), \
119+
$(eval $(call INSTALL_HOST_N,$(target),$(CFG_BUILD))), \
120+
$(eval $(call INSTALL_TARGET_N,$(target),$(CFG_BUILD)))))
121121

122-
INSTALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
123-
install-target-$(target)-host-$(CFG_BUILD_TRIPLE))
122+
INSTALL_TARGET_RULES = $(foreach target,$(CFG_TARGET), \
123+
install-target-$(target)-host-$(CFG_BUILD))
124124

125125
install: all install-host install-targets
126126

127127
# Shorthand for build/stageN/bin
128-
HB = $(HBIN$(ISTAGE)_H_$(CFG_BUILD_TRIPLE))
129-
HB2 = $(HBIN2_H_$(CFG_BUILD_TRIPLE))
128+
HB = $(HBIN$(ISTAGE)_H_$(CFG_BUILD))
129+
HB2 = $(HBIN2_H_$(CFG_BUILD))
130130
# Shorthand for build/stageN/lib
131-
HL = $(HLIB$(ISTAGE)_H_$(CFG_BUILD_TRIPLE))
131+
HL = $(HLIB$(ISTAGE)_H_$(CFG_BUILD))
132132
# Shorthand for the prefix bin directory
133133
PHB = $(PREFIX_BIN)
134134
# Shorthand for the prefix bin directory
135135
PHL = $(PREFIX_LIB)
136136

137137
install-host: LIB_SOURCE_DIR=$(HL)
138138
install-host: LIB_DESTIN_DIR=$(PHL)
139-
install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
139+
install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
140140
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_BIN))
141141
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_LIB))
142142
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_ROOT)/share/man/man1)
143-
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD_TRIPLE)))
144-
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD_TRIPLE)))
145-
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
146-
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
147-
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE)))
148-
$(Q)$(call INSTALL_LIB,$(LIBRUSTUV_GLOB_$(CFG_BUILD_TRIPLE)))
149-
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
150-
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE)))
151-
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE)))
152-
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE)))
153-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE)))
154-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE)))
143+
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD)))
144+
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD)))
145+
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD)))
146+
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD)))
147+
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD)))
148+
$(Q)$(call INSTALL_LIB,$(LIBRUSTUV_GLOB_$(CFG_BUILD)))
149+
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD)))
150+
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD)))
151+
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD)))
152+
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD)))
153+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD)))
154+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD)))
155155
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustc.1)
156156
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustdoc.1)
157157
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustpkg.1)
@@ -163,34 +163,35 @@ HOST_LIB_FROM_HL_GLOB = \
163163
$(patsubst $(HL)/%,$(PHL)/%,$(wildcard $(HL)/$(1)))
164164

165165
uninstall:
166-
$(Q)rm -f $(PHB)/rustc$(X_$(CFG_BUILD_TRIPLE))
167-
$(Q)rm -f $(PHB)/rustpkg$(X_$(CFG_BUILD_TRIPLE))
168-
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD_TRIPLE))
169-
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
170-
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
166+
$(Q)rm -f $(PHB)/rustc$(X_$(CFG_BUILD))
167+
$(Q)rm -f $(PHB)/rustpkg$(X_$(CFG_BUILD))
168+
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD))
169+
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD))
170+
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD))
171171
$(Q)for i in \
172-
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE))) \
173-
$(call HOST_LIB_FROM_HL_GLOB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE))) \
174-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTUV_GLOB_$(CFG_BUILD_TRIPLE))) \
175-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE))) \
176-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE))) \
177-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
178-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE))) \
172+
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD))) \
173+
$(call HOST_LIB_FROM_HL_GLOB,$(EXTRALIB_GLOB_$(CFG_BUILD))) \
174+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTUV_GLOB_$(CFG_BUILD))) \
175+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD))) \
176+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD))) \
177+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD))) \
178+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD))) \
179179
; \
180180
do rm -f $$i ; \
181181
done
182182
$(Q)rm -Rf $(PHL)/rustc
183-
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustc.1
184-
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustdoc.1
185-
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustpkg.1
183+
$(Q)rm -f $(PREFIX_ROOT)/$(CFG_MANDIR)/man1/rustc.1
184+
$(Q)rm -f $(PREFIX_ROOT)/$(CFG_MANDIR)/man1/rustdoc.1
185+
$(Q)rm -f $(PREFIX_ROOT)/$(CFG_MANDIR)/man1/rusti.1
186+
$(Q)rm -f $(PREFIX_ROOT)/$(CFG_MANDIR)/man1/rustpkg.1
186187

187188
# target platform specific variables
188189
# for arm-linux-androidabi
189190
define DEF_ADB_DEVICE_STATUS
190191
CFG_ADB_DEVICE_STATUS=$(1)
191192
endef
192193

193-
$(foreach target,$(CFG_TARGET_TRIPLES), \
194+
$(foreach target,$(CFG_TARGET), \
194195
$(if $(findstring $(target),"arm-linux-androideabi"), \
195196
$(if $(findstring adb,$(CFG_ADB)), \
196197
$(if $(findstring device,$(shell $(CFG_ADB) devices 2>/dev/null | grep -E '^[_A-Za-z0-9-]+[[:blank:]]+device')), \
@@ -246,12 +247,12 @@ install-runtime-target-$(1)-cleanup:
246247
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(LIBRUSTUV_GLOB_$(1)))
247248
endef
248249

249-
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD_TRIPLE)))
250+
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD)))
250251
$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,arm-linux-androideabi))
251252

252253
install-runtime-target: \
253254
install-runtime-target-arm-linux-androideabi-cleanup \
254-
install-runtime-target-arm-linux-androideabi-host-$(CFG_BUILD_TRIPLE)
255+
install-runtime-target-arm-linux-androideabi-host-$(CFG_BUILD)
255256
else
256257
install-runtime-target:
257258
@echo "No device to install runtime library"

‎mk/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ $$(LLVM_STAMP_$(1)): $(S)src/rustllvm/llvm-auto-clean-trigger
4242

4343
endef
4444

45-
$(foreach host,$(CFG_HOST_TRIPLES), \
45+
$(foreach host,$(CFG_HOST), \
4646
$(eval $(call DEF_LLVM_RULES,$(host))))

‎mk/perf.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010

1111

1212
ifdef CFG_PERF_TOOL
13-
rustc-perf$(X): $(CFG_BUILD_TRIPLE)/stage2/bin/rustc$(X_$(CFG_BUILD_TRIPLE))
13+
rustc-perf$(X): $(CFG_BUILD)/stage2/bin/rustc$(X_$(CFG_BUILD))
1414
@$(call E, perf compile: $@)
15-
$(PERF_STAGE2_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE)) \
15+
$(PERF_STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
1616
-o $@ $(COMPILER_CRATE) >rustc-perf.err 2>&1
1717
$(Q)rm -f $(LIBRUSTC_GLOB)
1818
else
19-
rustc-perf$(X): $(CFG_BUILD_TRIPLE)/stage2/bin/rustc$(X_$(CFG_BUILD_TRIPLE))
19+
rustc-perf$(X): $(CFG_BUILD)/stage2/bin/rustc$(X_$(CFG_BUILD))
2020
$(Q)touch $@
2121
endif
2222

23-
perf: check-stage2-perf rustc-perf$(X_$(CFG_BUILD_TRIPLE))
24-
$(Q)find $(CFG_BUILD_TRIPLE)/test/perf -name \*.err | xargs cat
23+
perf: check-stage2-perf rustc-perf$(X_$(CFG_BUILD))
24+
$(Q)find $(CFG_BUILD)/test/perf -name \*.err | xargs cat
2525
$(Q)cat rustc-perf.err

‎mk/platform.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
define DEF_HOST_VAR
1717
HOST_$(1) = $(subst i686,i386,$(word 1,$(subst -, ,$(1))))
1818
endef
19-
$(foreach t,$(CFG_TARGET_TRIPLES),$(eval $(call DEF_HOST_VAR,$(t))))
20-
$(foreach t,$(CFG_TARGET_TRIPLES),$(info cfg: host for $(t) is $(HOST_$(t))))
19+
$(foreach t,$(CFG_TARGET),$(eval $(call DEF_HOST_VAR,$(t))))
20+
$(foreach t,$(CFG_TARGET),$(info cfg: host for $(t) is $(HOST_$(t))))
2121

2222
# Ditto for OSTYPE
2323
define DEF_OSTYPE_VAR
2424
OSTYPE_$(1) = $(subst $(firstword $(subst -, ,$(1)))-,,$(1))
2525
endef
26-
$(foreach t,$(CFG_TARGET_TRIPLES),$(eval $(call DEF_OSTYPE_VAR,$(t))))
27-
$(foreach t,$(CFG_TARGET_TRIPLES),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
26+
$(foreach t,$(CFG_TARGET),$(eval $(call DEF_OSTYPE_VAR,$(t))))
27+
$(foreach t,$(CFG_TARGET),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
2828

2929
# FIXME: no-omit-frame-pointer is just so that task_start_wrapper
3030
# has a frame pointer and the stack walker can understand it. Turning off
@@ -378,7 +378,7 @@ CFG_UNIXY_i686-pc-mingw32 :=
378378
CFG_PATH_MUNGE_i686-pc-mingw32 :=
379379
CFG_LDPATH_i686-pc-mingw32 :=$(CFG_LDPATH_i686-pc-mingw32):$(PATH)
380380
CFG_RUN_i686-pc-mingw32=PATH="$(CFG_LDPATH_i686-pc-mingw32):$(1)" $(2)
381-
CFG_RUN_TARG_i686-pc-mingw32=$(call CFG_RUN_i686-pc-mingw32,$(HLIB$(1)_H_$(CFG_BUILD_TRIPLE)),$(2))
381+
CFG_RUN_TARG_i686-pc-mingw32=$(call CFG_RUN_i686-pc-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
382382

383383
# i586-mingw32msvc configuration
384384
CC_i586-mingw32msvc=$(CFG_MINGW32_CROSS_PATH)/bin/i586-mingw32msvc-gcc
@@ -432,7 +432,7 @@ CFG_UNIXY_x86_64-w64-mingw32 :=
432432
CFG_PATH_MUNGE_x86_64-w64-mingw32 :=
433433
CFG_LDPATH_x86_64-w64-mingw32 :=$(CFG_LDPATH_x86_64-w64-mingw32):$(PATH)
434434
CFG_RUN_x86_64-w64-mingw32=PATH="$(CFG_LDPATH_x86_64-w64-mingw32):$(1)" $(2)
435-
CFG_RUN_TARG_x86_64-w64-mingw32=$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD_TRIPLE)),$(2))
435+
CFG_RUN_TARG_x86_64-w64-mingw32=$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
436436

437437
# x86_64-unknown-freebsd configuration
438438
CC_x86_64-unknown-freebsd=$(CC)
@@ -498,7 +498,7 @@ define CFG_MAKE_TOOLCHAIN
498498
# We're using llvm-mc as our assembler because it supports
499499
# .cfi pseudo-ops on mac
500500
CFG_ASSEMBLE_$(1)=$$(CPP_$(1)) -E $$(CFG_DEPEND_FLAGS) $$(2) | \
501-
$$(LLVM_MC_$$(CFG_BUILD_TRIPLE)) \
501+
$$(LLVM_MC_$$(CFG_BUILD)) \
502502
-assemble \
503503
-filetype=obj \
504504
-triple=$(1) \
@@ -514,5 +514,5 @@ define CFG_MAKE_TOOLCHAIN
514514

515515
endef
516516

517-
$(foreach target,$(CFG_TARGET_TRIPLES),\
517+
$(foreach target,$(CFG_TARGET),\
518518
$(eval $(call CFG_MAKE_TOOLCHAIN,$(target))))

‎mk/pp.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ else
2424
"no-reformat\|xfail-pretty\|xfail-test")
2525
endif
2626

27-
reformat: $(SREQ1$(CFG_BUILD_TRIPLE))
27+
reformat: $(SREQ1$(CFG_BUILD))
2828
@$(call E, reformat [stage1]: $@)
2929
for i in $(PP_INPUTS_FILTERED); \
30-
do $(call CFG_RUN_TARG_$(CFG_BUILD_TRIPLE),1,$(CFG_BUILD_TRIPLE)/stage1/rustc$(X_$(CFG_BUILD_TRIPLE))) \
30+
do $(call CFG_RUN_TARG_$(CFG_BUILD),1,$(CFG_BUILD)/stage1/rustc$(X_$(CFG_BUILD))) \
3131
--pretty normal $$i >$$i.tmp; \
3232
if [ $$? -ne 0 ]; \
3333
then echo failed to print $$i; rm $$i.tmp; \

‎mk/rt.mk

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ endif
4444
define DEF_LIBUV_ARCH_VAR
4545
LIBUV_ARCH_$(1) = $$(subst i386,ia32,$$(subst x86_64,x64,$$(HOST_$(1))))
4646
endef
47-
$(foreach t,$(CFG_TARGET_TRIPLES),$(eval $(call DEF_LIBUV_ARCH_VAR,$(t))))
47+
$(foreach t,$(CFG_TARGET),$(eval $(call DEF_LIBUV_ARCH_VAR,$(t))))
4848

4949
ifdef CFG_ENABLE_FAST_MAKE
5050
LIBUV_DEPS := $(S)/.gitmodules
@@ -76,7 +76,7 @@ RUNTIME_CXXFLAGS_$(1)_$(2) = -D_RUST_STAGE$(2)
7676
# XXX: Like with --cfg stage0, pass the defines for stage1 to the stage0
7777
# build of non-build-triple host compilers
7878
ifeq ($(2),0)
79-
ifneq ($(strip $(CFG_BUILD_TRIPLE)),$(strip $(1)))
79+
ifneq ($(strip $(CFG_BUILD)),$(strip $(1)))
8080
RUNTIME_CFLAGS_$(1)_$(2) = -D_RUST_STAGE1
8181
RUNTIME_CXXFLAGS_$(1)_$(2) = -D_RUST_STAGE1
8282
endif
@@ -131,7 +131,7 @@ $$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.c $$(MKFILE_DEPS)
131131
$$(SNAP_DEFINES) $$(RUNTIME_CFLAGS_$(1)_$(2))) $$<
132132

133133
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.S $$(MKFILE_DEPS) \
134-
$$(LLVM_CONFIG_$$(CFG_BUILD_TRIPLE))
134+
$$(LLVM_CONFIG_$$(CFG_BUILD))
135135
@$$(call E, compile: $$@)
136136
$$(Q)$$(call CFG_ASSEMBLE_$(1),$$@,$$<)
137137

@@ -242,12 +242,11 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1))
242242
NO_LOAD="$$(LIBUV_NO_LOAD)" \
243243
V=$$(VERBOSE)
244244
endif
245-
246245
endef
247246

248247
# Instantiate template for all stages/targets
249-
$(foreach target,$(CFG_TARGET_TRIPLES), \
248+
$(foreach target,$(CFG_TARGET), \
250249
$(eval $(call DEF_THIRD_PARTY_TARGETS,$(target))))
251250
$(foreach stage,$(STAGES), \
252-
$(foreach target,$(CFG_TARGET_TRIPLES), \
251+
$(foreach target,$(CFG_TARGET), \
253252
$(eval $(call DEF_RUNTIME_TARGETS,$(target),$(stage)))))

‎mk/rustllvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ $(1)/rustllvm/%.o: rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
4646
endef
4747

4848
# Instantiate template for all stages
49-
$(foreach host,$(CFG_HOST_TRIPLES), \
49+
$(foreach host,$(CFG_HOST), \
5050
$(eval $(call DEF_RUSTLLVM_TARGETS,$(host))))

‎mk/snap.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
1717

1818
endef
1919

20-
$(foreach host,$(CFG_HOST_TRIPLES), \
20+
$(foreach host,$(CFG_HOST), \
2121
$(eval $(foreach stage,1 2 3, \
2222
$(eval $(call DEF_SNAP_FOR_STAGE_H,$(stage),$(host))))))
2323

24-
snap-stage1: snap-stage1-H-$(CFG_BUILD_TRIPLE)
24+
snap-stage1: snap-stage1-H-$(CFG_BUILD)
2525

26-
snap-stage2: snap-stage2-H-$(CFG_BUILD_TRIPLE)
26+
snap-stage2: snap-stage2-H-$(CFG_BUILD)
2727

28-
snap-stage3: snap-stage3-H-$(CFG_BUILD_TRIPLE)
28+
snap-stage3: snap-stage3-H-$(CFG_BUILD)

‎mk/stage0.mk

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Extract the snapshot host compiler
22

3-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/:
3+
$(HBIN0_H_$(CFG_BUILD))/:
44
mkdir -p $@
55

6-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/:
6+
$(HLIB0_H_$(CFG_BUILD))/:
77
mkdir -p $@
88

99
$(SNAPSHOT_RUSTC_POST_CLEANUP): \
1010
$(S)src/snapshots.txt \
1111
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
12-
| $(HBIN0_H_$(CFG_BUILD_TRIPLE))/
12+
| $(HBIN0_H_$(CFG_BUILD))/
1313

1414
@$(call E, fetch: $@)
1515
# Note: the variable "SNAPSHOT_FILE" is generally not set, and so
1616
# we generally only pass one argument to this script.
1717
ifdef CFG_ENABLE_LOCAL_RUST
18-
$(Q)$(S)src/etc/local_stage0.sh $(CFG_BUILD_TRIPLE) $(CFG_LOCAL_RUST_ROOT)
18+
$(Q)$(S)src/etc/local_stage0.sh $(CFG_BUILD) $(CFG_LOCAL_RUST_ROOT)
1919
else
20-
$(Q)$(CFG_PYTHON) $(S)src/etc/get-snapshot.py $(CFG_BUILD_TRIPLE) $(SNAPSHOT_FILE)
20+
$(Q)$(CFG_PYTHON) $(S)src/etc/get-snapshot.py $(CFG_BUILD) $(SNAPSHOT_FILE)
2121
ifdef CFG_ENABLE_PAX_FLAGS
2222
@$(call E, apply PaX flags: $@)
2323
@"$(CFG_PAXCTL)" -cm "$@"
@@ -27,34 +27,34 @@ endif
2727

2828
# Host libs will be extracted by the above rule
2929

30-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE)): \
31-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
32-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
30+
$(HLIB0_H_$(CFG_BUILD))/$(CFG_RUNTIME_$(CFG_BUILD)): \
31+
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
32+
| $(HLIB0_H_$(CFG_BUILD))/
3333
$(Q)touch $@
3434

35-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_STDLIB_$(CFG_BUILD_TRIPLE)): \
36-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
37-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
35+
$(HLIB0_H_$(CFG_BUILD))/$(CFG_STDLIB_$(CFG_BUILD)): \
36+
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
37+
| $(HLIB0_H_$(CFG_BUILD))/
3838
$(Q)touch $@
3939

40-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_EXTRALIB_$(CFG_BUILD_TRIPLE)): \
41-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
42-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
40+
$(HLIB0_H_$(CFG_BUILD))/$(CFG_EXTRALIB_$(CFG_BUILD)): \
41+
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
42+
| $(HLIB0_H_$(CFG_BUILD))/
4343
$(Q)touch $@
4444

45-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTUV_$(CFG_BUILD_TRIPLE)): \
46-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
45+
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTUV_$(CFG_BUILD)): \
46+
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD)) \
4747
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
4848
$(Q)touch $@
4949

50-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE)): \
51-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
50+
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTC_$(CFG_BUILD)): \
51+
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD)) \
5252
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
5353
$(Q)touch $@
5454

55-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE)): \
56-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
57-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
55+
$(HLIB0_H_$(CFG_BUILD))/$(CFG_RUSTLLVM_$(CFG_BUILD)): \
56+
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
57+
| $(HLIB0_H_$(CFG_BUILD))/
5858
$(Q)touch $@
5959

6060
# For other targets, let the host build the target:
@@ -128,5 +128,5 @@ endef
128128

129129
# Use stage1 to build other architectures: then you don't have to wait
130130
# for stage2, but you get the latest updates to the compiler source.
131-
$(foreach t,$(NON_BUILD_HOST_TRIPLES), \
132-
$(eval $(call BOOTSTRAP_STAGE0,$(t),1,$(CFG_BUILD_TRIPLE))))
131+
$(foreach t,$(NON_BUILD_HOSTS), \
132+
$(eval $(call BOOTSTRAP_STAGE0,$(t),1,$(CFG_BUILD))))

‎mk/target.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# This is the compile-time target-triple for the compiler. For the compiler at
1212
# runtime, this should be considered the host-triple. More explanation for why
1313
# this exists can be found on issue #2400
14-
export CFG_COMPILER_TRIPLE
14+
export CFG_COMPILER
1515

1616
# The standard libraries should be held up to a higher standard than any old
1717
# code, make sure that these common warnings are denied by default. These can
@@ -36,7 +36,7 @@ WFLAGS_ST2 = -D warnings
3636
# had its chance to clean it out; otherwise the other products will be
3737
# inadvertantly included in the clean out.
3838

39-
SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))
39+
SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD))
4040

4141
define TARGET_STAGE_N
4242

@@ -96,7 +96,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
9696
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(2)),$$(notdir $$@))
9797

9898
# Only build the compiler for host triples
99-
ifneq ($$(findstring $(2),$$(CFG_HOST_TRIPLES)),)
99+
ifneq ($$(findstring $(2),$$(CFG_HOST)),)
100100

101101
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
102102
$(2)/rustllvm/$(CFG_RUSTLLVM_$(3)) \
@@ -105,7 +105,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
105105
@$$(call E, cp: $$@)
106106
$$(Q)cp $$< $$@
107107

108-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): CFG_COMPILER_TRIPLE = $(2)
108+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): CFG_COMPILER = $(2)
109109
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
110110
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
111111
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
@@ -142,8 +142,8 @@ endif
142142
endef
143143

144144
# In principle, each host can build each target:
145-
$(foreach source,$(CFG_HOST_TRIPLES), \
146-
$(foreach target,$(CFG_TARGET_TRIPLES), \
145+
$(foreach source,$(CFG_HOST), \
146+
$(foreach target,$(CFG_TARGET), \
147147
$(eval $(call TARGET_STAGE_N,0,$(target),$(source))) \
148148
$(eval $(call TARGET_STAGE_N,1,$(target),$(source))) \
149149
$(eval $(call TARGET_STAGE_N,2,$(target),$(source))) \

‎mk/tests.mk

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,20 @@ ifdef CFG_WINDOWSY_$(1)
107107
stage2/$$(CFG_LIBDIR), \
108108
$$(if $$(findstring stage3,$$(1)), \
109109
stage3/$$(CFG_LIBDIR), \
110-
)))))/rustc/$$(CFG_BUILD_TRIPLE)/$$(CFG_LIBDIR)
110+
)))))/rustc/$$(CFG_BUILD)/$$(CFG_LIBDIR)
111111
CFG_RUN_TEST_$(1)=$$(call CFG_RUN_$(1),$$(call CFG_TESTLIB_$(1),$$(1),$$(3)),$$(1))
112112
endif
113113

114114
# Run the compiletest runner itself under valgrind
115115
ifdef CTEST_VALGRIND
116-
CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_TEST_$$(CFG_BUILD_TRIPLE),$$(2),$$(3))
116+
CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_TEST_$$(CFG_BUILD),$$(2),$$(3))
117117
else
118-
CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_$$(CFG_BUILD_TRIPLE),$$(TLIB$$(1)_T_$$(3)_H_$$(3)),$$(2))
118+
CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_$$(CFG_BUILD),$$(TLIB$$(1)_T_$$(3)_H_$$(3)),$$(2))
119119
endif
120120

121121
endef
122122

123-
$(foreach target,$(CFG_TARGET_TRIPLES), \
123+
$(foreach target,$(CFG_TARGET), \
124124
$(eval $(call DEF_TARGET_COMMANDS,$(target))))
125125

126126
# Target platform specific variables
@@ -129,7 +129,7 @@ define DEF_ADB_DEVICE_STATUS
129129
CFG_ADB_DEVICE_STATUS=$(1)
130130
endef
131131

132-
$(foreach target,$(CFG_TARGET_TRIPLES), \
132+
$(foreach target,$(CFG_TARGET), \
133133
$(if $(findstring $(target),"arm-linux-androideabi"), \
134134
$(if $(findstring adb,$(CFG_ADB)), \
135135
$(if $(findstring device,$(shell $(CFG_ADB) devices 2>/dev/null | grep -E '^[_A-Za-z0-9-]+[[:blank:]]+device')), \
@@ -158,11 +158,11 @@ $(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \
158158
$(shell adb push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \
159159
$(shell adb push $(CFG_ANDROID_CROSS_PATH)/arm-linux-androideabi/lib/armv7-a/libgnustl_shared.so \
160160
$(CFG_ADB_TEST_DIR) 1>/dev/null) \
161-
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD_TRIPLE))/$(CFG_RUNTIME_arm-linux-androideabi) \
161+
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(CFG_RUNTIME_arm-linux-androideabi) \
162162
$(CFG_ADB_TEST_DIR)) \
163-
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD_TRIPLE))/$(STDLIB_GLOB_arm-linux-androideabi) \
163+
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(STDLIB_GLOB_arm-linux-androideabi) \
164164
$(CFG_ADB_TEST_DIR)) \
165-
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD_TRIPLE))/$(EXTRALIB_GLOB_arm-linux-androideabi) \
165+
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(EXTRALIB_GLOB_arm-linux-androideabi) \
166166
$(CFG_ADB_TEST_DIR)) \
167167
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD_TRIPLE))/$(LIBRUSTUV_GLOB_arm-linux-androideabi) \
168168
$(CFG_ADB_TEST_DIR)) \
@@ -202,7 +202,7 @@ cleantmptestlogs:
202202
$(Q)rm -f tmp/*.log
203203

204204
cleantestlibs:
205-
$(Q)find $(CFG_BUILD_TRIPLE)/test \
205+
$(Q)find $(CFG_BUILD)/test \
206206
-name '*.[odasS]' -o \
207207
-name '*.so' -o \
208208
-name '*.dylib' -o \
@@ -293,7 +293,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
293293

294294
# Only test the compiler-dependent crates when the target is
295295
# able to build a compiler (when the target triple is in the set of host triples)
296-
ifneq ($$(findstring $(2),$$(CFG_HOST_TRIPLES)),)
296+
ifneq ($$(findstring $(2),$$(CFG_HOST)),)
297297

298298
check-stage$(1)-T-$(2)-H-$(3)-crates-exec: \
299299
$$(foreach crate,$$(TEST_CRATES), \
@@ -320,8 +320,8 @@ check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \
320320

321321
endef
322322

323-
$(foreach host,$(CFG_HOST_TRIPLES), \
324-
$(foreach target,$(CFG_TARGET_TRIPLES), \
323+
$(foreach host,$(CFG_HOST), \
324+
$(foreach target,$(CFG_TARGET), \
325325
$(foreach stage,$(STAGES), \
326326
$(eval $(call DEF_TEST_SETS,$(stage),$(target),$(host))))))
327327

@@ -366,7 +366,7 @@ $(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \
366366
@$$(call E, compile_and_link: $$@)
367367
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
368368

369-
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): CFG_COMPILER_TRIPLE = $(2)
369+
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): CFG_COMPILER = $(2)
370370
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): \
371371
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
372372
$$(SREQ$(1)_T_$(2)_H_$(3)) \
@@ -396,8 +396,8 @@ $(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
396396

397397
endef
398398

399-
$(foreach host,$(CFG_HOST_TRIPLES), \
400-
$(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
399+
$(foreach host,$(CFG_HOST), \
400+
$(eval $(foreach target,$(CFG_TARGET), \
401401
$(eval $(foreach stage,$(STAGES), \
402402
$(eval $(call TEST_RUNNER,$(stage),$(target),$(host))))))))
403403

@@ -451,11 +451,11 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
451451
@touch $$@
452452
endef
453453

454-
$(foreach host,$(CFG_HOST_TRIPLES), \
455-
$(foreach target,$(CFG_TARGET_TRIPLES), \
454+
$(foreach host,$(CFG_HOST), \
455+
$(foreach target,$(CFG_TARGET), \
456456
$(foreach stage,$(STAGES), \
457457
$(foreach crate, $(TEST_CRATES), \
458-
$(if $(findstring $(target),$(CFG_BUILD_TRIPLE)), \
458+
$(if $(findstring $(target),$(CFG_BUILD)), \
459459
$(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))), \
460460
$(if $(findstring $(target),"arm-linux-androideabi"), \
461461
$(if $(findstring $(CFG_ADB_DEVICE_STATUS),"true"), \
@@ -583,7 +583,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
583583
--run-lib-path $$(TLIB$(1)_T_$(2)_H_$(3)) \
584584
--rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
585585
--clang-path $(if $(CFG_CLANG),$(CFG_CLANG),clang) \
586-
--llvm-bin-path $(CFG_LLVM_INST_DIR_$(CFG_BUILD_TRIPLE))/bin \
586+
--llvm-bin-path $(CFG_LLVM_INST_DIR_$(CFG_BUILD))/bin \
587587
--aux-base $$(S)src/test/auxiliary/ \
588588
--stage-id stage$(1)-$(2) \
589589
--target $(2) \
@@ -603,8 +603,8 @@ CTEST_DEPS_codegen_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_TESTS)
603603

604604
endef
605605

606-
$(foreach host,$(CFG_HOST_TRIPLES), \
607-
$(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
606+
$(foreach host,$(CFG_HOST), \
607+
$(eval $(foreach target,$(CFG_TARGET), \
608608
$(eval $(foreach stage,$(STAGES), \
609609
$(eval $(call DEF_CTEST_VARS,$(stage),$(target),$(host))))))))
610610

@@ -646,8 +646,8 @@ endef
646646

647647
CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
648648

649-
$(foreach host,$(CFG_HOST_TRIPLES), \
650-
$(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
649+
$(foreach host,$(CFG_HOST), \
650+
$(eval $(foreach target,$(CFG_TARGET), \
651651
$(eval $(foreach stage,$(STAGES), \
652652
$(eval $(foreach name,$(CTEST_NAMES), \
653653
$(eval $(call DEF_RUN_COMPILETEST,$(stage),$(target),$(host),$(name))))))))))
@@ -685,8 +685,8 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
685685

686686
endef
687687

688-
$(foreach host,$(CFG_HOST_TRIPLES), \
689-
$(foreach target,$(CFG_TARGET_TRIPLES), \
688+
$(foreach host,$(CFG_HOST), \
689+
$(foreach target,$(CFG_TARGET), \
690690
$(foreach stage,$(STAGES), \
691691
$(foreach pretty-name,$(PRETTY_NAMES), \
692692
$(eval $(call DEF_RUN_PRETTY_TEST,$(stage),$(target),$(host),$(pretty-name)))))))
@@ -712,8 +712,8 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
712712

713713
endef
714714

715-
$(foreach host,$(CFG_HOST_TRIPLES), \
716-
$(foreach target,$(CFG_TARGET_TRIPLES), \
715+
$(foreach host,$(CFG_HOST), \
716+
$(foreach target,$(CFG_TARGET), \
717717
$(foreach stage,$(STAGES), \
718718
$(foreach docname,$(DOC_TEST_NAMES), \
719719
$(eval $(call DEF_RUN_DOC_TEST,$(stage),$(target),$(host),$(docname)))))))
@@ -734,7 +734,7 @@ doc-$(2)-extract$(1):
734734

735735
endef
736736

737-
$(foreach host,$(CFG_HOST_TRIPLES), \
737+
$(foreach host,$(CFG_HOST), \
738738
$(foreach docname,$(DOC_TEST_NAMES), \
739739
$(eval $(call DEF_DOC_TEST_HOST,$(host),$(docname)))))
740740

@@ -769,32 +769,32 @@ check-stage$(1)-T-$(2)-H-$(3): check-stage$(1)-T-$(2)-H-$(3)-exec
769769
endef
770770

771771
$(foreach stage,$(STAGES), \
772-
$(foreach target,$(CFG_TARGET_TRIPLES), \
773-
$(foreach host,$(CFG_HOST_TRIPLES), \
772+
$(foreach target,$(CFG_TARGET), \
773+
$(foreach host,$(CFG_HOST), \
774774
$(eval $(call DEF_CHECK_FOR_STAGE_AND_TARGET_AND_HOST,$(stage),$(target),$(host))))))
775775

776776
define DEF_CHECK_FOR_STAGE_AND_TARGET_AND_HOST_AND_GROUP
777777
check-stage$(1)-T-$(2)-H-$(3)-$(4): check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec
778778
endef
779779

780780
$(foreach stage,$(STAGES), \
781-
$(foreach target,$(CFG_TARGET_TRIPLES), \
782-
$(foreach host,$(CFG_HOST_TRIPLES), \
781+
$(foreach target,$(CFG_TARGET), \
782+
$(foreach host,$(CFG_HOST), \
783783
$(foreach group,$(TEST_GROUPS), \
784784
$(eval $(call DEF_CHECK_FOR_STAGE_AND_TARGET_AND_HOST_AND_GROUP,$(stage),$(target),$(host),$(group)))))))
785785

786786
define DEF_CHECK_FOR_STAGE
787-
check-stage$(1): check-stage$(1)-H-$$(CFG_BUILD_TRIPLE)
788-
check-stage$(1)-H-all: $$(foreach target,$$(CFG_TARGET_TRIPLES), \
787+
check-stage$(1): check-stage$(1)-H-$$(CFG_BUILD)
788+
check-stage$(1)-H-all: $$(foreach target,$$(CFG_TARGET), \
789789
check-stage$(1)-H-$$(target))
790790
endef
791791

792792
$(foreach stage,$(STAGES), \
793793
$(eval $(call DEF_CHECK_FOR_STAGE,$(stage))))
794794

795795
define DEF_CHECK_FOR_STAGE_AND_GROUP
796-
check-stage$(1)-$(2): check-stage$(1)-H-$$(CFG_BUILD_TRIPLE)-$(2)
797-
check-stage$(1)-H-all-$(2): $$(foreach target,$$(CFG_TARGET_TRIPLES), \
796+
check-stage$(1)-$(2): check-stage$(1)-H-$$(CFG_BUILD)-$(2)
797+
check-stage$(1)-H-all-$(2): $$(foreach target,$$(CFG_TARGET), \
798798
check-stage$(1)-H-$$(target)-$(2))
799799
endef
800800

@@ -804,21 +804,21 @@ $(foreach stage,$(STAGES), \
804804

805805

806806
define DEF_CHECK_FOR_STAGE_AND_HOSTS
807-
check-stage$(1)-H-$(2): $$(foreach target,$$(CFG_TARGET_TRIPLES), \
807+
check-stage$(1)-H-$(2): $$(foreach target,$$(CFG_TARGET), \
808808
check-stage$(1)-T-$$(target)-H-$(2))
809809
endef
810810

811811
$(foreach stage,$(STAGES), \
812-
$(foreach host,$(CFG_HOST_TRIPLES), \
812+
$(foreach host,$(CFG_HOST), \
813813
$(eval $(call DEF_CHECK_FOR_STAGE_AND_HOSTS,$(stage),$(host)))))
814814

815815
define DEF_CHECK_FOR_STAGE_AND_HOSTS_AND_GROUP
816-
check-stage$(1)-H-$(2)-$(3): $$(foreach target,$$(CFG_TARGET_TRIPLES), \
816+
check-stage$(1)-H-$(2)-$(3): $$(foreach target,$$(CFG_TARGET), \
817817
check-stage$(1)-T-$$(target)-H-$(2)-$(3))
818818
endef
819819

820820
$(foreach stage,$(STAGES), \
821-
$(foreach host,$(CFG_HOST_TRIPLES), \
821+
$(foreach host,$(CFG_HOST), \
822822
$(foreach group,$(TEST_GROUPS), \
823823
$(eval $(call DEF_CHECK_FOR_STAGE_AND_HOSTS_AND_GROUP,$(stage),$(host),$(group))))))
824824

@@ -827,7 +827,7 @@ $(foreach stage,$(STAGES), \
827827
######################################################################
828828

829829
FT := run_pass_stage2
830-
FT_LIB := $(call CFG_LIB_NAME_$(CFG_BUILD_TRIPLE),$(FT))
830+
FT_LIB := $(call CFG_LIB_NAME_$(CFG_BUILD),$(FT))
831831
FT_DRIVER := $(FT)_driver
832832

833833
GENERATED += tmp/$(FT).rc tmp/$(FT_DRIVER).rs
@@ -867,11 +867,11 @@ check-fast-T-$(2)-H-$(3): \
867867

868868
endef
869869

870-
$(foreach host,$(CFG_HOST_TRIPLES), \
871-
$(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
870+
$(foreach host,$(CFG_HOST), \
871+
$(eval $(foreach target,$(CFG_TARGET), \
872872
$(eval $(call DEF_CHECK_FAST_FOR_T_H,,$(target),$(host))))))
873873

874-
check-fast: tidy check-fast-H-$(CFG_BUILD_TRIPLE) check-stage2-std check-stage2-extra
874+
check-fast: tidy check-fast-H-$(CFG_BUILD) check-stage2-std check-stage2-extra
875875
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
876876

877877
define DEF_CHECK_FAST_FOR_H
@@ -880,5 +880,5 @@ check-fast-H-$(1): check-fast-T-$(1)-H-$(1)
880880

881881
endef
882882

883-
$(foreach host,$(CFG_HOST_TRIPLES), \
883+
$(foreach host,$(CFG_HOST), \
884884
$(eval $(call DEF_CHECK_FAST_FOR_H,$(host))))

‎mk/tools.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ $$(HBIN$(2)_H_$(4))/rustdoc$$(X_$(4)): \
127127

128128
endef
129129

130-
$(foreach host,$(CFG_HOST_TRIPLES), \
131-
$(foreach target,$(CFG_TARGET_TRIPLES), \
130+
$(foreach host,$(CFG_HOST), \
131+
$(foreach target,$(CFG_TARGET), \
132132
$(eval $(call TOOLS_STAGE_N_TARGET,0,1,$(host),$(target))) \
133133
$(eval $(call TOOLS_STAGE_N_TARGET,1,2,$(host),$(target))) \
134134
$(eval $(call TOOLS_STAGE_N_TARGET,2,3,$(host),$(target))) \
135135
$(eval $(call TOOLS_STAGE_N_TARGET,3,bogus,$(host),$(target)))))
136136

137-
$(foreach host,$(CFG_HOST_TRIPLES), \
137+
$(foreach host,$(CFG_HOST), \
138138
$(eval $(call TOOLS_STAGE_N_HOST,0,1,$(host),$(host))) \
139139
$(eval $(call TOOLS_STAGE_N_HOST,1,2,$(host),$(host))) \
140140
$(eval $(call TOOLS_STAGE_N_HOST,2,3,$(host),$(host))))

‎src/librustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ pub fn host_triple() -> ~str {
643643
// Instead of grabbing the host triple (for the current host), we grab (at
644644
// compile time) the target triple that this rustc is built with and
645645
// calling that (at runtime) the host triple.
646-
(env!("CFG_COMPILER_TRIPLE")).to_owned()
646+
(env!("CFG_COMPILER")).to_owned()
647647
}
648648

649649
pub fn build_session_options(binary: @str,

0 commit comments

Comments
 (0)
Please sign in to comment.