Upgrade Rust to build Cargo #2316
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
|
r? @huonw (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ 857778d |
|
⌛ Testing commit 857778d with merge 5cc34d1... |
|
💔 Test failed - cargo-win-msvc-32 |
| @@ -1135,7 +1135,8 @@ test!(build_script_with_dynamic_native_dependency { | |||
| "#) | |||
| .file("bar/src/lib.rs", r#" | |||
| pub fn bar() { | |||
| #[link(name = "builder")] | |||
| #[cfg_attr(not(target_env = "msvc"), link(name = "builder"))] | |||
| #[cfg_attr(target_env = "msvc", link(name = "builder.lib"))] | |||
There was a problem hiding this comment.
Shouldn't this be "builder.dll" since the library is builder.dll.lib?
A few small tweaks to tests were necessary to accomodate rust-lang/rust#29520, and a few changes were made to the code to account for that as well.
bors
added a commit
that referenced
this pull request
Jan 25, 2016
A few small tweaks to tests were necessary to accomodate rust-lang/rust#29520, and a few changes were made to the code to account for that as well.
|
☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64 |
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.
A few small tweaks to tests were necessary to accomodate rust-lang/rust#29520,
and a few changes were made to the code to account for that as well.