summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2013-09-23 10:06:29 -0700
committerAlex Crichton <alex@alexcrichton.com>2013-09-23 10:07:22 -0700
commit5a78b54586a07afa65822aa2d079da334ae70ca3 (patch)
tree742bc00023f84ca118ae316b2dc533d71a9c9d14
parent5b6ef090464d9936b238a9524bc291c1134e69cc (diff)
downloadrust-5a78b54586a07afa65822aa2d079da334ae70ca3.tar.gz
rust-5a78b54586a07afa65822aa2d079da334ae70ca3.zip
Disable zlib/libffi when configuring LLVM
This should help bring fewer dependencies in to the snapshots.

Closes #9397
-rwxr-xr-xconfigure2
-rw-r--r--src/rustllvm/llvm-auto-clean-trigger2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index c918cd73448..55f5afda1a0 100755
--- a/configure
+++ b/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/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
index 745dec8c70c..01a5eaefa89 100644
--- a/src/rustllvm/llvm-auto-clean-trigger
+++ b/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