---

yaml
---
r: 1759
b: refs/heads/master
c: b9bde9f
h: refs/heads/master
i:
  1757: 1d0b4c4
  1755: 488311c
  1751: 0097887
  1743: 2830b3d
  1727: c39da61
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dec5b5e5096c33e9790d133372bcd9bc2ee8889
+refs/heads/master: b9bde9fcfa40f06f51072fa97b2e858044498527

trunk/Makefile.in

@@ -70,7 +70,8 @@ ifdef CFG_WINDOWSY
   CFG_LIB_NAME=$(1).dll
   CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR)
   CFG_LDPATH :=$(CFG_LDPATH):$$PATH
-  CFG_RUN_TARG=PATH=$(CFG_LDPATH) $(1)
+  CFG_RUN_TEST=PATH="$(CFG_LDPATH)" $(1)
+  CFG_RUN_TARG=PATH="$(CFG_LDPATH)" $(1)
 
   CFG_PATH_MUNGE := $(strip | perl -p                  \
                            -e 's@\\(.)@/\1@go;'        \
@@ -88,6 +89,8 @@ ifdef CFG_UNIXY
   CFG_EXE_SUFFIX :=
   CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_LIBDIR)
   CFG_RUN_TARG=\
+      LD_LIBRARY_PATH=$(dir $(1)):$(CFG_LDPATH) $(1)
+  CFG_RUN_TEST=\
       LD_LIBRARY_PATH=$(dir $(1)):$(CFG_LDPATH) $(CFG_VALGRIND) $(1)
 
   CFG_BOOT_NATIVE := 1
@@ -98,6 +101,7 @@ ifdef CFG_UNIXY
     CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR)
     CFG_LDPATH :=$(CFG_LDPATH):$$PATH
     CFG_RUN_TARG=PATH=$(CFG_LDPATH) $(1)
+    CFG_RUN_TEST=PATH=$(CFG_LDPATH) $(1)
 
     CFG_INFO := $(info cfg: mingw-cross)
     CFG_GCC_CROSS := i586-mingw32msvc-
@@ -116,7 +120,7 @@ ifdef CFG_UNIXY
     CFG_VALGRIND += --leak-check=full \
                     --error-exitcode=1 \
                     --quiet --vex-iropt-level=0 \
-                    --suppressions=$(S)src/etc/x86.supp
+                    --suppressions=$(CFG_SRC_DIR)src/etc/x86.supp
   endif
 endif
 
@@ -179,6 +183,7 @@ else
 endif
 
 R := $(CFG_RUN_TARG)
+T := $(CFG_RUN_TEST)
 S := $(CFG_SRC_DIR)
 X := $(CFG_EXE_SUFFIX)
 
@@ -187,8 +192,8 @@ VPATH := $(S)doc $(S)src
 
 # Compilers we build, we now know how to run.
 BOOT := $(Q)OCAMLRUNPARAM="b1" boot/rustboot$(X) $(CFG_BOOT_FLAGS) -L boot
-STAGE0 := $(Q)$(CFG_RUN_TARG) stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0
-STAGE1 := $(Q)$(CFG_RUN_TARG) stage1/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1
+STAGE0 := $(Q)$(R) stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0
+STAGE1 := $(Q)$(R) stage1/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1
 
 # "Source" files we generate in builddir along the way.
 GENERATED := boot/fe/lexer.ml boot/version.ml
@@ -554,27 +559,27 @@ llvmext/%.o: llvmext/%.cpp $(MKFILES)
 test/run-pass/%.out.tmp: test/run-pass/%$(CFG_EXE_SUFFIX) rt/$(CFG_RUNTIME)
 	$(Q)rm -f $<.tmp
 	@$(call E, run: $@)
-	$(Q)$(call CFG_RUN_TARG, $<) > $@
+	$(Q)$(call T, $<) > $@
 
 test/bench/shootout/%.out.tmp: test/bench/shootout/%$(X) \
                                rt/$(CFG_RUNTIME)
 	$(Q)rm -f $<.tmp
 	@$(call E, run: $@)
-	$(Q)$(call CFG_RUN_TARG, $<) > $@
+	$(Q)$(call T, $<) > $@
 
 test/bench/99-bottles/%.out.tmp: test/bench/99-bottles/%$(X) \
                                  rt/$(CFG_RUNTIME)
 	$(Q)rm -f $<.tmp
 	@$(call E, run: $@)
-	$(Q)$(call CFG_RUN_TARG, $<) > $@
+	$(Q)$(call T, $<) > $@
 
 test/run-fail/%.out.tmp: test/run-fail/%$(X) \
                          rt/$(CFG_RUNTIME)
 	$(Q)rm -f $<.tmp
 	@$(call E, run: $@)
 	$(Q)grep -q error-pattern $(S)src/test/run-fail/$(basename $*).rs
 	$(Q)rm -f $@
-	$(Q)$(call CFG_RUN_TARG, $<) >$@ 2>&1 ; X=$$? ; \
+	$(Q)$(call T, $<) >$@ 2>&1 ; X=$$? ; \
       if [ $$X -eq 0 ] ; then exit 1 ; else exit 0 ; fi
 	$(Q)grep --text --quiet \
       "$$(grep error-pattern $(S)src/test/run-fail/$(basename $*).rs \
@@ -596,6 +601,15 @@ test/compile-fail/%.stage0.out.tmp: test/compile-fail/%.rs $(SREQ0)
 	$(Q)grep --text --quiet \
       "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
 
+######################################################################
+# Distribution
+######################################################################
+
+PKG_NAME := rust
+PKG_VER  = $(shell date +"%Y-%m-%d")-snap
+PKG_DIR = $(PKG_NAME)-$(PKG_VER)
+PKG_TAR = $(PKG_DIR).tar.gz
+
 
 ######################################################################
 # Cleanup
@@ -605,12 +619,23 @@ test/compile-fail/%.stage0.out.tmp: test/compile-fail/%.rs $(SREQ0)
 
 clean:
 	@$(call E, cleaning)
-	$(Q)rm -f $(foreach ext, cmx cmi cmo cma bc o a d $(X)     \
-                             h cpp ml s                        \
-                             out bc dSYM                       \
-                             ,                                 \
-                  $(wildcard     *.$(ext)                      \
-                               */*.$(ext)                      \
-                             */*/*.$(ext)                      \
-                           */*/*/*.$(ext)                      \
-                   ))
+	$(Q)rm -f $(RUNTIME_OBJS)
+	$(Q)rm -f $(LLVMEXT_OBJS)
+	$(Q)rm -f $(BOOT_CMOS) $(BOOT_CMIS) $(BOOT_CMXS) $(BOOT_OBJS)
+	$(Q)rm -f $(ML_DEPFILES) $(C_DEPFILES) $(CRATE_DEPFILES)
+	$(Q)rm -f $(ML_DEPFILES:%.d=%.d.tmp)
+	$(Q)rm -f $(C_DEPFILES:%.d=%.d.tmp)
+	$(Q)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp)
+	$(Q)rm -f $(GENERATED)
+	$(Q)rm -f boot/rustboot$(X) boot/$(CFG_STDLIB)
+	$(Q)rm -f stage0/rustc$(X) stage0/$(CFG_STDLIB) stage0/glue*
+	$(Q)rm -f stage1/rustc$(X) stage1/$(CFG_STDLIB) stage1/glue*
+	$(Q)rm -f stage2/rustc$(X) stage2/$(CFG_STDLIB) stage2/glue*
+	$(Q)rm -f llvmext/$(CFG_LLVMEXT) rt/$(CFG_RUNTIME)
+	$(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist
+	$(Q)rm -f $(foreach ext,cmx cmi cmo cma bc o a d exe,\
+                        $(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext)))
+	$(Q)rm -Rf $(foreach ext,out out.tmp                               \
+                             boot$(X) stage0$(X) stage1$(X) stage2$(X) \
+                             bc o s exe dSYM,                          \
+                        $(wildcard test/*/*.$(ext)))