---

yaml
---
r: 46463
b: refs/heads/auto
c: 15c0c35
h: refs/heads/master
i:
  46461: 2b6d014
  46459: 5024fa6
  46455: e605eef
  46447: fc87167
  46431: 4211167
  46399: ddcb6a7
  46335: f07af2f
v: v3

Author: brson

[refs]

@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: dab6a852303f68c2ed6c17abaca1d0728d9cf618
+refs/heads/auto: 15c0c35352720efd32bcfc5f4ae05b95f05cd1c0

branches/auto/Makefile.in

@@ -70,16 +70,22 @@ include config.mk
 ALL_OBJ_FILES :=
 
 MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*)
-NON_HOST_TRIPLES = $(filter-out $(CFG_HOST_TRIPLE),$(CFG_TARGET_TRIPLES))
+NON_BUILD_HOST_TRIPLES = $(filter-out $(CFG_BUILD_TRIPLE),$(CFG_HOST_TRIPLES))
+NON_BUILD_TARGET_TRIPLES = $(filter-out $(CFG_BUILD_TRIPLE),$(CFG_TARGET_TRIPLES))
 
 ifneq ($(MAKE_RESTARTS),)
 CFG_INFO := $(info cfg: make restarts: $(MAKE_RESTARTS))
 endif
 
-CFG_INFO := $(info cfg: shell host triple $(CFG_HOST_TRIPLE))
+CFG_INFO := $(info cfg: build triple $(CFG_BUILD_TRIPLE))
+CFG_INFO := $(info cfg: host triples $(CFG_HOST_TRIPLES))
+CFG_INFO := $(info cfg: target triples $(CFG_TARGET_TRIPLES))
 
-ifneq ($(wildcard $(NON_HOST_TRIPLES)),)
-CFG_INFO := $(info cfg: non host triples $(NON_HOST_TRIPLES))
+ifneq ($(wildcard $(NON_BUILD_HOST_TRIPLES)),)
+CFG_INFO := $(info cfg: non-build host triples $(NON_BUILD_HOST_TRIPLES))
+endif
+ifneq ($(wildcard $(NON_BUILD_TARGET_TRIPLES)),)
+CFG_INFO := $(info cfg: non-build target triples $(NON_BUILD_TARGET_TRIPLES))
 endif
 
 CFG_RUSTC_FLAGS := $(RUSTFLAGS)
@@ -272,8 +278,8 @@ LLC_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llc$$(X)
 
 endef
 
-$(foreach target,$(CFG_TARGET_TRIPLES), \
- $(eval $(call DEF_LLVM_VARS,$(target))))
+$(foreach host,$(CFG_HOST_TRIPLES), \
+ $(eval $(call DEF_LLVM_VARS,$(host))))
 
 ######################################################################
 # Exports for sub-utilities
@@ -285,7 +291,7 @@ $(foreach target,$(CFG_TARGET_TRIPLES), \
 export CFG_SRC_DIR
 export CFG_BUILD_DIR
 export CFG_VERSION
-export CFG_HOST_TRIPLE
+export CFG_BUILD_TRIPLE
 export CFG_LLVM_ROOT
 export CFG_ENABLE_MINGW_CROSS
 export CFG_PREFIX
@@ -409,7 +415,7 @@ CFGFLAG$(1)_T_$(2)_H_$(3) = stage$(1)
 # if you're building a cross config, the host->* parts are
 # effectively stage1, since it uses the just-built stage0.
 ifeq ($(1),0)
-ifneq ($(strip $(CFG_HOST_TRIPLE)),$(strip $(3)))
+ifneq ($(strip $(CFG_BUILD_TRIPLE)),$(strip $(3)))
 CFGFLAG$(1)_T_$(2)_H_$(3) = stage1
 endif
 endif
@@ -430,7 +436,7 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := 				\
 
 endef
 
-$(foreach build,$(CFG_TARGET_TRIPLES), \
+$(foreach build,$(CFG_HOST_TRIPLES), \
  $(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
   $(eval $(foreach stage,$(STAGES), \
    $(eval $(call SREQ,$(stage),$(target),$(build))))))))
@@ -451,13 +457,13 @@ rustc-stage$(2)-H-$(1):							\
 
 endef
 
-$(foreach host,$(CFG_TARGET_TRIPLES),							\
+$(foreach host,$(CFG_HOST_TRIPLES),							\
  $(eval $(foreach stage,1 2 3,									\
   $(eval $(call DEF_RUSTC_STAGE_TARGET,$(host),$(stage))))))
 
-rustc-stage1: rustc-stage1-H-$(CFG_HOST_TRIPLE)
-rustc-stage2: rustc-stage2-H-$(CFG_HOST_TRIPLE)
-rustc-stage3: rustc-stage3-H-$(CFG_HOST_TRIPLE)
+rustc-stage1: rustc-stage1-H-$(CFG_BUILD_TRIPLE)
+rustc-stage2: rustc-stage2-H-$(CFG_BUILD_TRIPLE)
+rustc-stage3: rustc-stage3-H-$(CFG_BUILD_TRIPLE)
 
 define DEF_RUSTC_TARGET
 # $(1) == architecture
@@ -468,12 +474,12 @@ endef
 $(foreach host,$(CFG_TARGET_TRIPLES),			\
  $(eval $(call DEF_RUSTC_TARGET,$(host))))
 
-rustc-stage1: rustc-stage1-H-$(CFG_HOST_TRIPLE)
-rustc-stage2: rustc-stage2-H-$(CFG_HOST_TRIPLE)
-rustc-stage3: rustc-stage3-H-$(CFG_HOST_TRIPLE)
-rustc: rustc-H-$(CFG_HOST_TRIPLE)
+rustc-stage1: rustc-stage1-H-$(CFG_BUILD_TRIPLE)
+rustc-stage2: rustc-stage2-H-$(CFG_BUILD_TRIPLE)
+rustc-stage3: rustc-stage3-H-$(CFG_BUILD_TRIPLE)
+rustc: rustc-H-$(CFG_BUILD_TRIPLE)
 
-rustc-H-all: $(foreach host,$(CFG_TARGET_TRIPLES),rustc-H-$(host))
+rustc-H-all: $(foreach host,$(CFG_HOST_TRIPLES),rustc-H-$(host))
 
 ######################################################################
 # Entrypoint rule
@@ -489,19 +495,27 @@ CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
 CFG_INFO := $(info cfg:)
 
 #XXX This is surely busted
-all: $(SREQ1$(CFG_HOST_TRIPLE)) $(GENERATED) docs
+all: $(SREQ1$(CFG_BUILD_TRIPLE)) $(GENERATED) docs
 
 else
 
 define ALL_TARGET_N
+ifneq ($$(findstring $(1),$$(CFG_HOST_TRIPLES)),)
+# This is a host
 all-target-$(1)-host-$(2): $$(CSREQ2_T_$(1)_H_$(2))
+else
+# This is a target only
+all-target-$(1)-host-$(2): $$(SREQ2_T_$(1)_H_$(2))
+endif
 endef
 
 $(foreach target,$(CFG_TARGET_TRIPLES), \
- $(eval $(call ALL_TARGET_N,$(target),$(CFG_HOST_TRIPLE))))
+ $(foreach host,$(CFG_HOST_TRIPLES), \
+ $(eval $(call ALL_TARGET_N,$(target),$(host)))))
 
 ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
- all-target-$(target)-host-$(CFG_HOST_TRIPLE))
+	$(foreach host,$(CFG_HOST_TRIPLES), \
+ all-target-$(target)-host-$(host)))
 
 all: $(ALL_TARGET_RULES) $(GENERATED) docs
 

branches/auto/configure

@@ -301,7 +301,7 @@ then
 fi
 
 
-DEFAULT_HOST_TRIPLE="${CFG_CPUTYPE}-${CFG_OSTYPE}"
+DEFAULT_BUILD_TRIPLE="${CFG_CPUTYPE}-${CFG_OSTYPE}"
 
 CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
 CFG_BUILD_DIR="$(pwd)/"
@@ -346,8 +346,9 @@ opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-
 valopt prefix "/usr/local" "set installation prefix"
 valopt local-rust-root "/usr/local" "set prefix for local rust binary"
 valopt llvm-root "" "set LLVM root"
-valopt host-triple "${DEFAULT_HOST_TRIPLE}" "LLVM host triple"
-valopt target-triples "${CFG_HOST_TRIPLE}" "LLVM target triples"
+valopt build-triple "${DEFAULT_BUILD_TRIPLE}" "LLVM build triple"
+valopt host-triples "${CFG_BUILD_TRIPLE}" "LLVM host triples"
+valopt target-triples "${CFG_HOST_TRIPLES}" "LLVM target triples"
 
 # Validate Options
 step_msg "validating $CFG_SELF args"
@@ -532,10 +533,6 @@ fi
 
 CFG_PREFIX=${CFG_PREFIX%/}
 CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
-case $CFG_TARGET_TRIPLES in
-    (*$CFG_HOST_TRIPLE*) ;;
-    (*) err "Host triple is not among the target triples." ;;
-esac
 
 if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
 then
@@ -562,13 +559,13 @@ do
 done
 
 make_dir llvm
-for t in $CFG_TARGET_TRIPLES
+for t in $CFG_HOST_TRIPLES
 do
     make_dir llvm/$t
 done
 
 make_dir rustllvm
-for t in $CFG_TARGET_TRIPLES
+for t in $CFG_HOST_TRIPLES
 do
     make_dir rustllvm/$t
 done
@@ -593,7 +590,7 @@ then
     CFG_LIBDIR=bin
 fi
 
-for h in $CFG_TARGET_TRIPLES
+for h in $CFG_HOST_TRIPLES
 do
     for t in $CFG_TARGET_TRIPLES
     do
@@ -669,7 +666,7 @@ fi
 # Configure llvm, only if necessary
 step_msg "looking at LLVM"
 CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/
-for t in $CFG_TARGET_TRIPLES
+for t in $CFG_HOST_TRIPLES
 do
     do_reconfigure=1
 
@@ -819,6 +816,8 @@ putvar CFG_OSTYPE
 putvar CFG_CPUTYPE
 putvar CFG_CONFIGURE_ARGS
 putvar CFG_PREFIX
+putvar CFG_BUILD_TRIPLE
+putvar CFG_HOST_TRIPLES
 putvar CFG_TARGET_TRIPLES
 putvar CFG_C_COMPILER
 putvar CFG_LIBDIR
@@ -854,7 +853,7 @@ fi
 putvar CFG_LLVM_ROOT
 putvar CFG_LLVM_SRC_DIR
 
-for t in $CFG_TARGET_TRIPLES
+for t in $CFG_HOST_TRIPLES
 do
     CFG_LLVM_BUILD_DIR=$(echo CFG_LLVM_BUILD_DIR_${t} | tr - _)
     CFG_LLVM_INST_DIR=$(echo CFG_LLVM_INST_DIR_${t} | tr - _)

branches/auto/doc/tutorial-tasks.md

@@ -157,7 +157,7 @@ concurrently:
 
 ~~~~
 use task::spawn;
-use comm::{stream, Port, Chan};
+use pipes::{stream, Port, Chan};
 
 let (port, chan): (Port<int>, Chan<int>) = stream();
 
@@ -178,7 +178,7 @@ stream for sending and receiving integers (the left-hand side of the `let`,
 a tuple into its component parts).
 
 ~~~~
-# use comm::{stream, Chan, Port};
+# use pipes::{stream, Chan, Port};
 let (port, chan): (Port<int>, Chan<int>) = stream();
 ~~~~
 
@@ -189,7 +189,7 @@ spawns the child task.
 ~~~~
 # use task::{spawn};
 # use task::spawn;
-# use comm::{stream, Port, Chan};
+# use pipes::{stream, Port, Chan};
 # fn some_expensive_computation() -> int { 42 }
 # let (port, chan) = stream();
 do spawn || {
@@ -209,7 +209,7 @@ computation, then waits for the child's result to arrive on the
 port:
 
 ~~~~
-# use comm::{stream, Port, Chan};
+# use pipes::{stream, Port, Chan};
 # fn some_other_expensive_computation() {}
 # let (port, chan) = stream::<int>();
 # chan.send(0);
@@ -225,7 +225,7 @@ following program is ill-typed:
 
 ~~~ {.xfail-test}
 # use task::{spawn};
-# use comm::{stream, Port, Chan};
+# use pipes::{stream, Port, Chan};
 # fn some_expensive_computation() -> int { 42 }
 let (port, chan) = stream();
 
@@ -245,7 +245,7 @@ Instead we can use a `SharedChan`, a type that allows a single
 
 ~~~
 # use task::spawn;
-use comm::{stream, SharedChan};
+use pipes::{stream, SharedChan};
 
 let (port, chan) = stream();
 let chan = SharedChan(chan);
@@ -278,7 +278,7 @@ might look like the example below.
 
 ~~~
 # use task::spawn;
-# use comm::{stream, Port, Chan};
+# use pipes::{stream, Port, Chan};
 
 // Create a vector of ports, one for each child task
 let ports = do vec::from_fn(3) |init_val| {
@@ -393,7 +393,7 @@ internally, with additional logic to wait for the child task to finish
 before returning. Hence:
 
 ~~~
-# use comm::{stream, Chan, Port};
+# use pipes::{stream, Chan, Port};
 # use task::{spawn, try};
 # fn sleep_forever() { loop { task::yield() } }
 # do task::try {
@@ -468,7 +468,7 @@ Here is the function that implements the child task:
 
 ~~~~
 # use std::comm::DuplexStream;
-# use comm::{Port, Chan};
+# use pipes::{Port, Chan};
 fn stringifier(channel: &DuplexStream<~str, uint>) {
     let mut value: uint;
     loop {
@@ -491,7 +491,7 @@ Here is the code for the parent task:
 
 ~~~~
 # use std::comm::DuplexStream;
-# use comm::{Port, Chan};
+# use pipes::{Port, Chan};
 # use task::spawn;
 # fn stringifier(channel: &DuplexStream<~str, uint>) {
 #     let mut value: uint;

branches/auto/mk/clean.mk

@@ -14,7 +14,7 @@
 
 CLEAN_STAGE_RULES =								\
  $(foreach stage, $(STAGES),					\
-  $(foreach host, $(CFG_TARGET_TRIPLES),		\
+  $(foreach host, $(CFG_HOST_TRIPLES),		\
    clean$(stage)_H_$(host)						\
    $(foreach target, $(CFG_TARGET_TRIPLES),		\
     clean$(stage)_T_$(target)_H_$(host))))
@@ -33,15 +33,15 @@ clean: clean-misc $(CLEAN_STAGE_RULES)
 
 clean-misc:
 	@$(call E, cleaning)
-	$(Q)find rustllvm rt $(CFG_HOST_TRIPLE)/test \
+	$(Q)find rustllvm rt $(CFG_BUILD_TRIPLE)/test \
          -name '*.[odasS]' -o \
          -name '*.so' -o      \
          -name '*.dylib' -o   \
          -name '*.dll' -o     \
          -name '*.def' -o     \
          -name '*.bc'         \
          | xargs rm -f
-	$(Q)find rustllvm rt $(CFG_HOST_TRIPLE)\
+	$(Q)find rustllvm rt $(CFG_BUILD_TRIPLE)\
          -name '*.dSYM'       \
          | xargs rm -Rf
 	$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)
@@ -93,7 +93,7 @@ clean$(1)_H_$(2):
 
 endef
 
-$(foreach host, $(CFG_TARGET_TRIPLES), \
+$(foreach host, $(CFG_HOST_TRIPLES), \
  $(eval $(foreach stage, $(STAGES), \
   $(eval $(call CLEAN_HOST_STAGE_N,$(stage),$(host))))))
 
@@ -127,12 +127,12 @@ clean$(1)_T_$(2)_H_$(3):
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/run_pass_stage* # For windows
 endef
 
-$(foreach host, $(CFG_TARGET_TRIPLES), \
+$(foreach host, $(CFG_HOST_TRIPLES), \
  $(eval $(foreach target, $(CFG_TARGET_TRIPLES), \
   $(eval $(foreach stage, 0 1 2 3, \
    $(eval $(call CLEAN_TARGET_STAGE_N,$(stage),$(target),$(host))))))))
 
-define DEF_CLEAN_LLVM_TARGET
+define DEF_CLEAN_LLVM_HOST
 ifeq ($(CFG_LLVM_ROOT),)
 clean-llvm$(1):
 	$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) clean
@@ -142,5 +142,5 @@ clean-llvm$(1): ;
 endif
 endef
 
-$(foreach target, $(CFG_TARGET_TRIPLES), \
- $(eval $(call DEF_CLEAN_LLVM_TARGET,$(target))))
+$(foreach host, $(CFG_HOST_TRIPLES), \
+ $(eval $(call DEF_CLEAN_LLVM_HOST,$(host))))

branches/auto/mk/docs.mk

@@ -171,7 +171,7 @@ ifeq ($(CFG_PANDOC),)
 else
 
 # The rustdoc executable
-RUSTDOC = $(HBIN2_H_$(CFG_HOST_TRIPLE))/rustdoc$(X)
+RUSTDOC = $(HBIN2_H_$(CFG_BUILD_TRIPLE))/rustdoc$(X)
 
 # The library documenting macro
 # $(1) - The output directory

branches/auto/mk/host.mk

@@ -115,7 +115,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM): \
 
 endef
 
-$(foreach t,$(CFG_TARGET_TRIPLES),					\
+$(foreach t,$(CFG_HOST_TRIPLES),					\
 	$(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t)))	\
 	$(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t)))	\
 	$(eval $(call CP_HOST_STAGE_N,2,3,$(t),$(t))))