-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
Update Cargo, build curl/OpenSSL statically via features #54919
Conversation
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks generally good to me -- left a few nits.
src/bootstrap/dist.rs
Outdated
}); | ||
cmd.env("OPENSSL_DIR", dir); | ||
} | ||
// if let Some(dir) = builder.openssl_install_dir(builder.config.build) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, I think we probably want to keep this? Or I guess maybe just delete it since we're not managing openssl on our self?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops I meant to delete this! I built OpenSSL in at least one of our containers so I'm hoping that this isn't necessary any more, but if it fails on the bots I'll probably need to find a workaround
d339359
to
9156ef5
Compare
@bors: r=Mark-Simulacrum |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
9156ef5
to
8f0b88a
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
8f0b88a
to
214cd62
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Thanks @nrc! It looks like racer may also need an update to avoid duplicating |
I can do that this morning |
hmm, updating Racer was harder than I thought - currently blocked on racer-rust/racer#974 |
☔ The latest upstream changes (presumably #55004) made this pull request unmergeable. Please resolve the merge conflicts. |
@nrc @alexcrichton with rust-lang/rls#1095 merged, the |
In addition to to updating Cargo's submodule and Cargo's dependencies, this also updates Cargo's build to build OpenSSL statically into Cargo as well as libcurl unconditionally. This removes OpenSSL build logic from the bootstrap code, and otherwise requests that even on OSX we build curl statically.
e5c13a5
to
4f661c0
Compare
📌 Commit 4f661c0 has been approved by |
⌛ Testing commit 4f661c0 with merge cbc9745d20e7c60023bdb9ba926d65e99ea6b08d... |
💔 Test failed - status-travis |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
@bors retry "The system is going down for power off NOW!" again?! |
Update Cargo, build curl/OpenSSL statically via features In addition to to updating Cargo's submodule and Cargo's dependencies, this also updates Cargo's build to build OpenSSL statically into Cargo as well as libcurl unconditionally. This removes OpenSSL build logic from the bootstrap code, and otherwise requests that even on OSX we build curl statically.
☀️ Test successful - status-appveyor, status-travis |
In addition to to updating Cargo's submodule and Cargo's dependencies,
this also updates Cargo's build to build OpenSSL statically into Cargo
as well as libcurl unconditionally. This removes OpenSSL build logic
from the bootstrap code, and otherwise requests that even on OSX we
build curl statically.