diff options
| author | bors <bors@rust-lang.org> | 2013-09-25 10:01:00 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-25 10:01:00 -0700 |
| commit | b6f74e696f790c18f6a2f720529a6c93514a8da2 (patch) | |
| tree | 16752a6c8769e60cdf0862ed2d23b753cb10f086 | |
| parent | 5375cf87182555e7d91089b95c088793db32fa05 (diff) | |
| parent | 5a78b54586a07afa65822aa2d079da334ae70ca3 (diff) | |
| download | rust-b6f74e696f790c18f6a2f720529a6c93514a8da2.tar.gz rust-b6f74e696f790c18f6a2f720529a6c93514a8da2.zip | |
auto merge of #9428 : alexcrichton/rust/llvm-zlib-and-libffi, r=pnkfelix
This should help bring fewer dependencies in to the snapshots. Closes #9397
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/rustllvm/llvm-auto-clean-trigger | 2 |
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 |