Skip to content

Commit ac3e32a

Browse files
borsbors
committed
---
yaml --- r: 146335 b: refs/heads/try2 c: b2f62ac h: refs/heads/master i: 146333: 614e99a 146331: 2cc4131 146327: 243c247 146319: f932502 146303: 173ba87 v: v3
1 parent 3043db3 commit ac3e32a

File tree

158 files changed

+2888
-1840
lines changed

Some content is hidden

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

158 files changed

+2888
-1840
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 986fb3c617e569d6342bab23e06456dca27942ef
8+
refs/heads/try2: b2f62acaebbe2aa0962c0402d467310b2571ff4e
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

Lines changed: 54 additions & 35 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.
@@ -221,19 +221,22 @@ CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
221221
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
222222
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
223223
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
224+
CFG_LIBRUSTUV_$(1) :=$(call CFG_LIB_NAME_$(1),rustuv)
224225

225226
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
226227
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
227228
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
228229
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
229230
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
230231
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
232+
LIBRUSTUV_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustuv)
231233
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
232234
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
233235
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
234236
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
235237
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
236238
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
239+
LIBRUSTUV_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustuv)
237240

238241
endef
239242

@@ -270,7 +273,7 @@ define LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
270273
endef
271274
endif
272275

273-
$(foreach target,$(CFG_TARGET_TRIPLES),\
276+
$(foreach target,$(CFG_TARGET),\
274277
$(eval $(call DEF_LIBS,$(target))))
275278

276279
######################################################################
@@ -289,6 +292,14 @@ EXTRALIB_CRATE := $(S)src/libextra/extra.rs
289292
EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/, \
290293
*.rs */*.rs))
291294

295+
######################################################################
296+
# Rust UV library variables
297+
######################################################################
298+
299+
LIBRUSTUV_CRATE := $(S)src/librustuv/rustuv.rs
300+
LIBRUSTUV_INPUTS := $(wildcard $(addprefix $(S)src/librustuv/, \
301+
*.rs */*.rs))
302+
292303
######################################################################
293304
# rustc crate variables
294305
######################################################################
@@ -336,7 +347,7 @@ LLC_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llc$$(X_$(1))
336347

337348
endef
338349

339-
$(foreach host,$(CFG_HOST_TRIPLES), \
350+
$(foreach host,$(CFG_HOST), \
340351
$(eval $(call DEF_LLVM_VARS,$(host))))
341352

342353
######################################################################
@@ -350,7 +361,7 @@ export CFG_SRC_DIR
350361
export CFG_BUILD_DIR
351362
export CFG_VERSION
352363
export CFG_VERSION_WIN
353-
export CFG_BUILD_TRIPLE
364+
export CFG_BUILD
354365
export CFG_LLVM_ROOT
355366
export CFG_ENABLE_MINGW_CROSS
356367
export CFG_PREFIX
@@ -410,6 +421,11 @@ else
410421
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
411422
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
412423
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
424+
425+
HLIBRUSTUV_DEFAULT$(1)_H_$(3) = \
426+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTUV_$(3))
427+
TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3) = \
428+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
413429
endif
414430

415431
# Preqrequisites for using the stageN compiler
@@ -421,6 +437,7 @@ HSREQ$(1)_H_$(3) = \
421437
$$(HEXTRALIB_DEFAULT$(1)_H_$(3)) \
422438
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
423439
$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
440+
$$(HLIBRUSTUV_DEFAULT$(1)_H_$(3)) \
424441
$$(MKFILE_DEPS)
425442

426443
# Prerequisites for using the stageN compiler to build target artifacts
@@ -433,7 +450,8 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
433450
SREQ$(1)_T_$(2)_H_$(3) = \
434451
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
435452
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
436-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
453+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
454+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
437455

438456
# Prerequisites for a working stageN compiler and libraries, for a specific target
439457
CSREQ$(1)_T_$(2)_H_$(3) = \
@@ -447,7 +465,8 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
447465
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
448466
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
449467
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
450-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
468+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
469+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
451470

452471
ifeq ($(1),0)
453472
# Don't run the the stage0 compiler under valgrind - that ship has sailed
@@ -465,7 +484,7 @@ CFGFLAG$(1)_T_$(2)_H_$(3) = stage$(1)
465484
# if you're building a cross config, the host->* parts are
466485
# effectively stage1, since it uses the just-built stage0.
467486
ifeq ($(1),0)
468-
ifneq ($(strip $(CFG_BUILD_TRIPLE)),$(strip $(3)))
487+
ifneq ($(strip $(CFG_BUILD)),$(strip $(3)))
469488
CFGFLAG$(1)_T_$(2)_H_$(3) = stage1
470489
endif
471490
endif
@@ -488,8 +507,8 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
488507

489508
endef
490509

491-
$(foreach build,$(CFG_HOST_TRIPLES), \
492-
$(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
510+
$(foreach build,$(CFG_HOST), \
511+
$(eval $(foreach target,$(CFG_TARGET), \
493512
$(eval $(foreach stage,$(STAGES), \
494513
$(eval $(call SREQ,$(stage),$(target),$(build))))))))
495514

@@ -504,34 +523,34 @@ define DEF_RUSTC_STAGE_TARGET
504523
# $(2) == stage
505524

506525
rustc-stage$(2)-H-$(1): \
507-
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
526+
$$(foreach target,$$(CFG_TARGET), \
508527
$$(SREQ$(2)_T_$$(target)_H_$(1)))
509528

510529
endef
511530

512-
$(foreach host,$(CFG_HOST_TRIPLES), \
531+
$(foreach host,$(CFG_HOST), \
513532
$(eval $(foreach stage,1 2 3, \
514533
$(eval $(call DEF_RUSTC_STAGE_TARGET,$(host),$(stage))))))
515534

516-
rustc-stage1: rustc-stage1-H-$(CFG_BUILD_TRIPLE)
517-
rustc-stage2: rustc-stage2-H-$(CFG_BUILD_TRIPLE)
518-
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)
519538

520539
define DEF_RUSTC_TARGET
521540
# $(1) == architecture
522541

523542
rustc-H-$(1): rustc-stage2-H-$(1)
524543
endef
525544

526-
$(foreach host,$(CFG_TARGET_TRIPLES), \
545+
$(foreach host,$(CFG_TARGET), \
527546
$(eval $(call DEF_RUSTC_TARGET,$(host))))
528547

529-
rustc-stage1: rustc-stage1-H-$(CFG_BUILD_TRIPLE)
530-
rustc-stage2: rustc-stage2-H-$(CFG_BUILD_TRIPLE)
531-
rustc-stage3: rustc-stage3-H-$(CFG_BUILD_TRIPLE)
532-
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)
533552

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

536555
######################################################################
537556
# Entrypoint rule
@@ -547,12 +566,12 @@ CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
547566
CFG_INFO := $(info cfg:)
548567

549568
#XXX This is surely busted
550-
all: $(SREQ1$(CFG_BUILD_TRIPLE)) $(GENERATED) docs
569+
all: $(SREQ1$(CFG_BUILD)) $(GENERATED) docs
551570

552571
else
553572

554573
define ALL_TARGET_N
555-
ifneq ($$(findstring $(1),$$(CFG_HOST_TRIPLES)),)
574+
ifneq ($$(findstring $(1),$$(CFG_HOST)),)
556575
# This is a host
557576
all-target-$(1)-host-$(2): $$(CSREQ2_T_$(1)_H_$(2))
558577
else
@@ -561,12 +580,12 @@ all-target-$(1)-host-$(2): $$(SREQ2_T_$(1)_H_$(2))
561580
endif
562581
endef
563582

564-
$(foreach target,$(CFG_TARGET_TRIPLES), \
565-
$(foreach host,$(CFG_HOST_TRIPLES), \
583+
$(foreach target,$(CFG_TARGET), \
584+
$(foreach host,$(CFG_HOST), \
566585
$(eval $(call ALL_TARGET_N,$(target),$(host)))))
567586

568-
ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
569-
$(foreach host,$(CFG_HOST_TRIPLES), \
587+
ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET), \
588+
$(foreach host,$(CFG_HOST), \
570589
all-target-$(target)-host-$(host)))
571590

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

0 commit comments

Comments
 (0)