Assume at least LLVM 3.9 in rustllvm and rustc_llvm #46435
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We bumped the minimum LLVM to 3.9 in rust-lang#45326. This just cleans up the conditional code in the rustllvm C++ wrappers to assume at least 3.9.
|
r? @arielb1 (rust_highfive has picked a reviewer for you, use r? to override) |
estebank
reviewed
Dec 1, 2017
| @@ -96,11 +83,11 @@ fn main() { | |||
| let version_output = output(&mut version_cmd); | |||
| let mut parts = version_output.split('.').take(2) | |||
| .filter_map(|s| s.parse::<u32>().ok()); | |||
| let (major, minor) = | |||
| let (major, _minor) = | |||
| if let (Some(major), Some(minor)) = (parts.next(), parts.next()) { | |||
| (major, minor) | |||
There was a problem hiding this comment.
Shouldn't this panic! if it encounters a version < 3.9?
There was a problem hiding this comment.
We certainly could, but this is also checked in bootstrap.
kennytm
added
the
S-waiting-on-review
|
LGTM, nice cleanup! Supposedly I have bors access now, let's try this: @bors r+ |
|
@rkruppe: 🔑 Insufficient privileges: Not in reviewers |
|
@rkruppe: 🔑 Insufficient privileges: and not in try users |
|
📌 Commit 5c4452a has been approved by |
kennytm
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Dec 3, 2017
Assume at least LLVM 3.9 in rustllvm and rustc_llvm We bumped the minimum LLVM to 3.9 in #45326. This just cleans up the conditional code in the `rustllvm` C++ wrappers to assume that minimum, and similarly cleans up the `rustc_llvm` build script.
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We bumped the minimum LLVM to 3.9 in #45326. This just cleans up the conditional code in the
rustllvmC++ wrappers to assume that minimum, and similarly cleans up therustc_llvmbuild script.