Skip to content

Commit 32558ea

Browse files
thestingerthestinger
committed
---
yaml --- r: 48074 b: refs/heads/incoming c: ca1ceb1 h: refs/heads/master v: v3
1 parent 397fded commit 32558ea

File tree

592 files changed

+8655
-7575
lines changed

Some content is hidden

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

592 files changed

+8655
-7575
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 7714d52cd9381c8ba3257da124cd91ffadeda4d5
9+
refs/heads/incoming: ca1ceb15b1f80d687525f166d99adb1c37b6081d
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/incoming/.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
url = git://github.com/brson/llvm.git
44
[submodule "src/libuv"]
55
path = src/libuv
6-
url = https://github.com/ILyoan/libuv.git
6+
url = git://github.com/joyent/libuv.git

‎branches/incoming/AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Josh Matthews <[email protected]>
9393
Joshua Clark <[email protected]>
9494
Joshua Wise <[email protected]>
9595
Jyun-Yan You <[email protected]>
96+
Kang Seonghoon <[email protected]>
9697
Kelly Wilson <[email protected]>
9798
Kevin Atkinson <[email protected]>
9899
Kevin Cantu <[email protected]>

‎branches/incoming/Makefile.in

Lines changed: 94 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,16 @@ 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_HOST_TRIPLES = $(filter-out $(CFG_HOST_TRIPLE),$(CFG_TARGET_TRIPLES))
7574

7675
ifneq ($(MAKE_RESTARTS),)
7776
CFG_INFO := $(info cfg: make restarts: $(MAKE_RESTARTS))
7877
endif
7978

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))
79+
CFG_INFO := $(info cfg: shell host triple $(CFG_HOST_TRIPLE))
8380

84-
ifneq ($(wildcard $(NON_BUILD_HOST_TRIPLES)),)
85-
CFG_INFO := $(info cfg: non-build host triples $(NON_BUILD_HOST_TRIPLES))
86-
endif
87-
ifneq ($(wildcard $(NON_BUILD_TARGET_TRIPLES)),)
88-
CFG_INFO := $(info cfg: non-build target triples $(NON_BUILD_TARGET_TRIPLES))
81+
ifneq ($(wildcard $(NON_HOST_TRIPLES)),)
82+
CFG_INFO := $(info cfg: non host triples $(NON_HOST_TRIPLES))
8983
endif
9084

9185
CFG_RUSTC_FLAGS := $(RUSTFLAGS)
@@ -130,6 +124,37 @@ else
130124
CFG_VALGRIND_COMPILE :=
131125
endif
132126

127+
CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
128+
CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
129+
CFG_CORELIB :=$(call CFG_LIB_NAME,core)
130+
CFG_STDLIB :=$(call CFG_LIB_NAME,std)
131+
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
132+
CFG_LIBSYNTAX :=$(call CFG_LIB_NAME,syntax)
133+
CFG_LIBFUZZER :=$(call CFG_LIB_NAME,fuzzer)
134+
CFG_LIBRUSTPKG :=$(call CFG_LIB_NAME,rustpkg)
135+
CFG_LIBRUSTDOC :=$(call CFG_LIB_NAME,rustdoc)
136+
CFG_LIBRUSTI :=$(call CFG_LIB_NAME,rusti)
137+
CFG_LIBRUST :=$(call CFG_LIB_NAME,rust)
138+
139+
STDLIB_GLOB :=$(call CFG_LIB_GLOB,std)
140+
CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
141+
LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
142+
LIBSYNTAX_GLOB :=$(call CFG_LIB_GLOB,syntax)
143+
LIBFUZZER_GLOB :=$(call CFG_LIB_GLOB,fuzzer)
144+
LIBRUSTPKG_GLOB :=$(call CFG_LIB_GLOB,rustpkg)
145+
LIBRUSTDOC_GLOB :=$(call CFG_LIB_GLOB,rustdoc)
146+
LIBRUSTI_GLOB :=$(call CFG_LIB_GLOB,rusti)
147+
LIBRUST_GLOB :=$(call CFG_LIB_GLOB,rust)
148+
STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
149+
CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
150+
LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
151+
LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax)
152+
LIBFUZZER_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,fuzzer)
153+
LIBRUSTPKG_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustpkg)
154+
LIBRUSTDOC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustdoc)
155+
LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)
156+
LIBRUST_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rust)
157+
133158
# version-string calculation
134159
CFG_GIT_DIR := $(CFG_SRC_DIR).git
135160
CFG_RELEASE = 0.6
@@ -168,12 +193,7 @@ else
168193
endif
169194

170195
S := $(CFG_SRC_DIR)
171-
172-
define DEF_X
173-
X_$(1) := $(CFG_EXE_SUFFIX_$(1))
174-
endef
175-
$(foreach target,$(CFG_TARGET_TRIPLES),\
176-
$(eval $(call DEF_X,$(target))))
196+
X := $(CFG_EXE_SUFFIX)
177197

178198
# Look in doc and src dirs.
179199
VPATH := $(S)doc $(S)src
@@ -189,49 +209,6 @@ GENERATED :=
189209
%:: s.%
190210
%:: SCCS/s.%
191211

192-
193-
######################################################################
194-
# Crates
195-
######################################################################
196-
197-
define DEF_LIBS
198-
199-
CFG_RUNTIME_$(1) :=$(call CFG_LIB_NAME_$(1),rustrt)
200-
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
201-
CFG_CORELIB_$(1) :=$(call CFG_LIB_NAME_$(1),core)
202-
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
203-
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
204-
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
205-
CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
206-
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
207-
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
208-
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
209-
CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
210-
211-
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
212-
CORELIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),core)
213-
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
214-
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
215-
LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
216-
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
217-
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
218-
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
219-
LIBRUST_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rust)
220-
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
221-
CORELIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),core)
222-
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
223-
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
224-
LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
225-
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
226-
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
227-
LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
228-
LIBRUST_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rust)
229-
230-
endef
231-
232-
$(foreach target,$(CFG_TARGET_TRIPLES),\
233-
$(eval $(call DEF_LIBS,$(target))))
234-
235212
######################################################################
236213
# Core library variables
237214
######################################################################
@@ -277,8 +254,8 @@ CFG_LLVM_BUILD_DIR_$(1):=$$(CFG_LLVM_BUILD_DIR_$(subst -,_,$(1)))
277254
CFG_LLVM_INST_DIR_$(1):=$$(CFG_LLVM_INST_DIR_$(subst -,_,$(1)))
278255

279256
# Any rules that depend on LLVM should depend on LLVM_CONFIG
280-
LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-config$$(X_$(1))
281-
LLVM_MC_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-mc$$(X_$(1))
257+
LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-config$$(X)
258+
LLVM_MC_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-mc$$(X)
282259
LLVM_VERSION_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --version)
283260
LLVM_BINDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --bindir)
284261
LLVM_INCDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --includedir)
@@ -290,13 +267,13 @@ LLVM_LDFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --ldflags)
290267
LLVM_CXXFLAGS_$(1)=$$(subst -I, -iquote , $$(shell "$$(LLVM_CONFIG_$(1))" --cxxflags))
291268
LLVM_HOST_TRIPLE_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --host-target)
292269

293-
LLVM_AS_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-as$$(X_$(1))
294-
LLC_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llc$$(X_$(1))
270+
LLVM_AS_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-as$$(X)
271+
LLC_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llc$$(X)
295272

296273
endef
297274

298-
$(foreach host,$(CFG_HOST_TRIPLES), \
299-
$(eval $(call DEF_LLVM_VARS,$(host))))
275+
$(foreach target,$(CFG_TARGET_TRIPLES), \
276+
$(eval $(call DEF_LLVM_VARS,$(target))))
300277

301278
######################################################################
302279
# Exports for sub-utilities
@@ -308,7 +285,7 @@ $(foreach host,$(CFG_HOST_TRIPLES), \
308285
export CFG_SRC_DIR
309286
export CFG_BUILD_DIR
310287
export CFG_VERSION
311-
export CFG_BUILD_TRIPLE
288+
export CFG_HOST_TRIPLE
312289
export CFG_LLVM_ROOT
313290
export CFG_ENABLE_MINGW_CROSS
314291
export CFG_PREFIX
@@ -355,26 +332,26 @@ ifdef CFG_DISABLE_SHAREDSTD
355332
$$(TLIB$(1)_T_$(2)_H_$(3))/librustc.rlib
356333
else
357334
HCORELIB_DEFAULT$(1)_H_$(3) = \
358-
$$(HLIB$(1)_H_$(3))/$(CFG_CORELIB_$(3))
335+
$$(HLIB$(1)_H_$(3))/$(CFG_CORELIB)
359336
TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
360-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2))
337+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
361338

362339
HSTDLIB_DEFAULT$(1)_H_$(3) = \
363-
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB_$(3))
340+
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB)
364341
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
365-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
342+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
366343

367344
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
368-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
345+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC)
369346
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
370-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
347+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
371348
endif
372349

373350
# Preqrequisites for using the stageN compiler
374351
HSREQ$(1)_H_$(3) = \
375-
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
376-
$$(HLIB$(1)_H_$(3))/$(CFG_RUNTIME_$(3)) \
377-
$$(HLIB$(1)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
352+
$$(HBIN$(1)_H_$(3))/rustc$$(X) \
353+
$$(HLIB$(1)_H_$(3))/$$(CFG_RUNTIME) \
354+
$$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLLVM) \
378355
$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
379356
$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
380357
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
@@ -384,37 +361,37 @@ HSREQ$(1)_H_$(3) = \
384361
# Prerequisites for using the stageN compiler to build target artifacts
385362
TSREQ$(1)_T_$(2)_H_$(3) = \
386363
$$(HSREQ$(1)_H_$(3)) \
387-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2)) \
364+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUNTIME) \
388365
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
389366

390367
# Prerequisites for a working stageN compiler and libraries, for a specific target
391368
SREQ$(1)_T_$(2)_H_$(3) = \
392369
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
393-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
394-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
370+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
371+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
395372

396373
# Prerequisites for a working stageN compiler and libraries, for a specific target
397374
CSREQ$(1)_T_$(2)_H_$(3) = \
398375
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
399-
$$(HBIN$(1)_H_$(3))/fuzzer$$(X_$(3)) \
400-
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
401-
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
402-
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
403-
$$(HBIN$(1)_H_$(3))/rust$$(X_$(3)) \
404-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBFUZZER_$(3)) \
405-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
406-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
407-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
408-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUST_$(3)) \
409-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
410-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
411-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
412-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
413-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2)) \
414-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
415-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
416-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \
417-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUST_$(2))
376+
$$(HBIN$(1)_H_$(3))/fuzzer$$(X) \
377+
$$(HBIN$(1)_H_$(3))/rustpkg$$(X) \
378+
$$(HBIN$(1)_H_$(3))/rustdoc$$(X) \
379+
$$(HBIN$(1)_H_$(3))/rusti$$(X) \
380+
$$(HBIN$(1)_H_$(3))/rust$$(X) \
381+
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBFUZZER) \
382+
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTPKG) \
383+
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTDOC) \
384+
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTI) \
385+
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUST) \
386+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
387+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \
388+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX) \
389+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) \
390+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBFUZZER) \
391+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTPKG) \
392+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC) \
393+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI) \
394+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUST)
418395

419396
ifeq ($(1),0)
420397
# Don't run the the stage0 compiler under valgrind - that ship has sailed
@@ -432,30 +409,28 @@ CFGFLAG$(1)_T_$(2)_H_$(3) = stage$(1)
432409
# if you're building a cross config, the host->* parts are
433410
# effectively stage1, since it uses the just-built stage0.
434411
ifeq ($(1),0)
435-
ifneq ($(strip $(CFG_BUILD_TRIPLE)),$(strip $(3)))
412+
ifneq ($(strip $(CFG_HOST_TRIPLE)),$(strip $(3)))
436413
CFGFLAG$(1)_T_$(2)_H_$(3) = stage1
437414
endif
438415
endif
439416

440417
STAGE$(1)_T_$(2)_H_$(3) := \
441-
$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
418+
$$(Q)$$(call CFG_RUN_TARG,$(1), \
442419
$$(CFG_VALGRIND_COMPILE$(1)) \
443-
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
420+
$$(HBIN$(1)_H_$(3))/rustc$$(X) \
444421
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
445-
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
446-
$$(RUSTC_FLAGS_$(2))
422+
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
447423

448424
PERF_STAGE$(1)_T_$(2)_H_$(3) := \
449-
$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
425+
$$(Q)$$(call CFG_RUN_TARG,$(1), \
450426
$$(CFG_PERF_TOOL) \
451-
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
427+
$$(HBIN$(1)_H_$(3))/rustc$$(X) \
452428
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
453-
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
454-
$$(RUSTC_FLAGS_$(2))
429+
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
455430

456431
endef
457432

458-
$(foreach build,$(CFG_HOST_TRIPLES), \
433+
$(foreach build,$(CFG_TARGET_TRIPLES), \
459434
$(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
460435
$(eval $(foreach stage,$(STAGES), \
461436
$(eval $(call SREQ,$(stage),$(target),$(build))))))))
@@ -476,13 +451,13 @@ rustc-stage$(2)-H-$(1): \
476451

477452
endef
478453

479-
$(foreach host,$(CFG_HOST_TRIPLES), \
454+
$(foreach host,$(CFG_TARGET_TRIPLES), \
480455
$(eval $(foreach stage,1 2 3, \
481456
$(eval $(call DEF_RUSTC_STAGE_TARGET,$(host),$(stage))))))
482457

483-
rustc-stage1: rustc-stage1-H-$(CFG_BUILD_TRIPLE)
484-
rustc-stage2: rustc-stage2-H-$(CFG_BUILD_TRIPLE)
485-
rustc-stage3: rustc-stage3-H-$(CFG_BUILD_TRIPLE)
458+
rustc-stage1: rustc-stage1-H-$(CFG_HOST_TRIPLE)
459+
rustc-stage2: rustc-stage2-H-$(CFG_HOST_TRIPLE)
460+
rustc-stage3: rustc-stage3-H-$(CFG_HOST_TRIPLE)
486461

487462
define DEF_RUSTC_TARGET
488463
# $(1) == architecture
@@ -493,12 +468,12 @@ endef
493468
$(foreach host,$(CFG_TARGET_TRIPLES), \
494469
$(eval $(call DEF_RUSTC_TARGET,$(host))))
495470

496-
rustc-stage1: rustc-stage1-H-$(CFG_BUILD_TRIPLE)
497-
rustc-stage2: rustc-stage2-H-$(CFG_BUILD_TRIPLE)
498-
rustc-stage3: rustc-stage3-H-$(CFG_BUILD_TRIPLE)
499-
rustc: rustc-H-$(CFG_BUILD_TRIPLE)
471+
rustc-stage1: rustc-stage1-H-$(CFG_HOST_TRIPLE)
472+
rustc-stage2: rustc-stage2-H-$(CFG_HOST_TRIPLE)
473+
rustc-stage3: rustc-stage3-H-$(CFG_HOST_TRIPLE)
474+
rustc: rustc-H-$(CFG_HOST_TRIPLE)
500475

501-
rustc-H-all: $(foreach host,$(CFG_HOST_TRIPLES),rustc-H-$(host))
476+
rustc-H-all: $(foreach host,$(CFG_TARGET_TRIPLES),rustc-H-$(host))
502477

503478
######################################################################
504479
# Entrypoint rule
@@ -514,27 +489,19 @@ CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
514489
CFG_INFO := $(info cfg:)
515490

516491
#XXX This is surely busted
517-
all: $(SREQ1$(CFG_BUILD_TRIPLE)) $(GENERATED) docs
492+
all: $(SREQ1$(CFG_HOST_TRIPLE)) $(GENERATED) docs
518493

519494
else
520495

521496
define ALL_TARGET_N
522-
ifneq ($$(findstring $(1),$$(CFG_HOST_TRIPLES)),)
523-
# This is a host
524497
all-target-$(1)-host-$(2): $$(CSREQ2_T_$(1)_H_$(2))
525-
else
526-
# This is a target only
527-
all-target-$(1)-host-$(2): $$(SREQ2_T_$(1)_H_$(2))
528-
endif
529498
endef
530499

531500
$(foreach target,$(CFG_TARGET_TRIPLES), \
532-
$(foreach host,$(CFG_HOST_TRIPLES), \
533-
$(eval $(call ALL_TARGET_N,$(target),$(host)))))
501+
$(eval $(call ALL_TARGET_N,$(target),$(CFG_HOST_TRIPLE))))
534502

535503
ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
536-
$(foreach host,$(CFG_HOST_TRIPLES), \
537-
all-target-$(target)-host-$(host)))
504+
all-target-$(target)-host-$(CFG_HOST_TRIPLE))
538505

539506
all: $(ALL_TARGET_RULES) $(GENERATED) docs
540507

0 commit comments

Comments
 (0)