---

yaml
---
r: 79433
b: refs/heads/snap-stage3
c: ba3ce32
h: refs/heads/master
i:
  79431: 765ea19
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 124eb2119c78651cfaaa7a046a101fa2e20f83ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: d4ebe835b265bdc255773bc5598d7d1fae9591f2
+refs/heads/snap-stage3: ba3ce3262749a400e290d19161849c5351c1e726
 refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

@@ -823,7 +823,7 @@ do
         index2="${CFG_SRC_DIR}src/llvm/.git/index"
         for index in ${index1} ${index2}
         do
-            config_status="${CFG_BUILD_DIR}llvm/$t/config.status"
+            config_status="${LLVM_BUILD_DIR}/config.status"
             if test -e ${index} -a \
                     -e ${config_status} -a \
                     ${config_status} -nt ${index}

branches/snap-stage3/mk/rustllvm.mk

@@ -19,7 +19,7 @@ define DEF_RUSTLLVM_TARGETS
 # llvm, but using it straight out of the build directory)
 ifdef CFG_WINDOWSY_$(1)
 LLVM_EXTRA_INCDIRS_$(1)= -iquote $(S)src/llvm/include \
-                         -iquote $$(CFG_LLVM_BUILD_DIR_$(1))/include
+                         -iquote llvm/$(1)/include
 endif
 
 RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, RustWrapper.cpp PassWrapper.cpp)

branches/snap-stage3/mk/tests.mk

@@ -250,6 +250,7 @@ tidy:
 		| grep '^$(S)src/test' -v \
 		| grep '^$(S)src/libuv' -v \
 		| grep '^$(S)src/llvm' -v \
+		| grep '^$(S)src/gyp' -v \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)find $(S)src/etc -name '*.py' \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py

branches/snap-stage3/src/libextra/extra.rs

@@ -85,6 +85,7 @@ pub mod getopts;
 pub mod json;
 pub mod md4;
 pub mod tempfile;
+pub mod glob;
 pub mod term;
 pub mod time;
 pub mod arena;