Skip to content

Commit

Permalink
Disable zlib/libffi when configuring LLVM
Browse files Browse the repository at this point in the history
This should help bring fewer dependencies in to the snapshots.

Closes #9397
  • Loading branch information
alexcrichton committed Sep 23, 2013
1 parent 5b6ef09 commit 5a78b54
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/rustllvm/llvm-auto-clean-trigger
Original file line number Diff line number Diff line change
@@ -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

21 comments on commit 5a78b54

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at alexcrichton@5a78b54

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 into auto

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 merged ok, testing candidate = 689ecce7

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at alexcrichton@5a78b54

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 into auto

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 merged ok, testing candidate = 3d4030df

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at alexcrichton@5a78b54

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 into auto

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 merged ok, testing candidate = ea51fc3f

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at alexcrichton@5a78b54

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 into auto

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 merged ok, testing candidate = cf626724

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at alexcrichton@5a78b54

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 into auto

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/llvm-zlib-and-libffi = 5a78b54 merged ok, testing candidate = b6f74e6

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

@bors
Copy link
Contributor

@bors bors commented on 5a78b54 Sep 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = b6f74e6

Please sign in to comment.