---

bors · bors · commit 7c71cb629bb1 · 2013-09-25T10:01:00.000-07:00
yaml --- r: 81859 b: refs/heads/master c: b6f74e6 h: refs/heads/master i: 81857: 1f71b52 81855: a5a02cb v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5375cf87182555e7d91089b95c088793db32fa05
+refs/heads/master: b6f74e696f790c18f6a2f720529a6c93514a8da2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
diff --git a/trunk/configure b/trunk/configure
@@ -848,6 +848,8 @@ do
         # Disable term-info, linkage of which comes in multiple forms,
         # making our snapshots incompatible (#9334)
         LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
+        # Try to have LLVM pull in as few dependencies as possible (#9397)
+        LLVM_OPTS="$LLVM_OPTS --disable-zlib --disable-libffi"
 
         case "$CFG_C_COMPILER" in
             ("ccache clang")
diff --git a/trunk/src/rustllvm/llvm-auto-clean-trigger b/trunk/src/rustllvm/llvm-auto-clean-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2013-09-22
+2013-09-23
