---

bors · bors · commit 6f42bd41f1a2 · 2013-09-21T22:20:56.000-07:00
yaml --- r: 81753 b: refs/heads/master c: eabcb39 h: refs/heads/master i: 81751: a919571 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 72633a2af25e0155ca9952a635f7a52d0c88bf00
+refs/heads/master: eabcb39f8d5c634185174461481ec1f39fe07bcb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
diff --git a/trunk/configure b/trunk/configure
@@ -845,6 +845,9 @@ do
 
         # Disable unused LLVM features
         LLVM_OPTS="$LLVM_DBG_OPTS $LLVM_ASSERTION_OPTS --disable-docs --enable-bindings=none"
+        # Disable term-info, linkage of which comes in multiple forms,
+        # making our snapshots incompatible (#9334)
+        LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
 
         case "$CFG_C_COMPILER" in
             ("ccache clang")
