Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump libz-sys to 1.0.9 #3393

Merged
merged 1 commit into from
Dec 15, 2016
Merged

Conversation

alexcrichton
Copy link
Member

This just switches libz to always link statically instead of relying on the
system zlib. For MinGW it seems that linkage may default pull in a DLL, which is
almost never what we want.

Closes #3384

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

📌 Commit 746f762 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

⌛ Testing commit 746f762 with merge 0bf616f...

@rust-highfive
Copy link

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member Author

alexcrichton commented Dec 13, 2016 via email

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

⌛ Testing commit 746f762 with merge 39263b0...

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member Author

alexcrichton commented Dec 13, 2016 via email

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

⌛ Testing commit 746f762 with merge fb1143f...

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member Author

alexcrichton commented Dec 13, 2016 via email

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

📌 Commit 746f762 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

⌛ Testing commit 746f762 with merge d2a1999...

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member Author

alexcrichton commented Dec 13, 2016 via email

@bors
Copy link
Collaborator

bors commented Dec 14, 2016

⌛ Testing commit 746f762 with merge bee49da...

@bors
Copy link
Collaborator

bors commented Dec 14, 2016

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Dec 14, 2016

☔ The latest upstream changes (presumably #3363) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Dec 14, 2016

📌 Commit 4be3fe8 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Dec 14, 2016

⌛ Testing commit 4be3fe8 with merge e45ba64...

@bors
Copy link
Collaborator

bors commented Dec 14, 2016

💔 Test failed - status-appveyor

@alexcrichton alexcrichton force-pushed the fix-libz-linkage branch 2 times, most recently from 8e53b48 to b9343b3 Compare December 15, 2016 00:16
@alexcrichton
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Dec 15, 2016

📌 Commit b9343b3 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Dec 15, 2016

⌛ Testing commit b9343b3 with merge 813699e...

This just switches libz to always link statically instead of relying on the
system zlib. For MinGW it seems that linkage may default pull in a DLL, which is
almost never what we want.

Also update curl-sys to fix a build issue on MinGW.

Closes rust-lang#3384
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Dec 15, 2016

📌 Commit 34b44ce has been approved by alexcrichton

@brson
Copy link
Contributor

brson commented Dec 15, 2016

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Dec 15, 2016

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Dec 15, 2016

📌 Commit 34b44ce has been approved by brson

@bors
Copy link
Collaborator

bors commented Dec 15, 2016

⌛ Testing commit 34b44ce with merge d902f59...

bors added a commit that referenced this pull request Dec 15, 2016
Bump libz-sys to 1.0.9

This just switches libz to always link statically instead of relying on the
system zlib. For MinGW it seems that linkage may default pull in a DLL, which is
almost never what we want.

Closes #3384
@bors
Copy link
Collaborator

bors commented Dec 15, 2016

☀️ Test successful - status-appveyor, status-travis
Approved by: brson
Pushing d902f59 to master...

@bors bors merged commit 34b44ce into rust-lang:master Dec 15, 2016
@alexcrichton alexcrichton deleted the fix-libz-linkage branch December 15, 2016 16:48
@ehuss ehuss added this to the 1.15.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cargo for x86_64-pc-windows-gnu is broken
5 participants