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

Use new kind= syntax for libs throughout Cargo #1405

Merged
merged 1 commit into from
Mar 26, 2015

Conversation

alexcrichton
Copy link
Member

This should inadvertently fix #1401

@rust-highfive
Copy link

r? @huonw

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

@@ -173,7 +173,7 @@ pub fn compile_targets<'a, 'b>(env: &str,

for (&(ref pkg, _), output) in cx.build_state.outputs.lock().unwrap().iter() {
let any_dylib = output.library_links.iter().any(|l| {
!l.ends_with(":static") && !l.ends_with(":framework")
!l.ends_with("static=") && !l.ends_with("framework=")
Copy link

Choose a reason for hiding this comment

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

ends_with => starts_with?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh dear... that's only a little embarrasing

@bors
Copy link
Contributor

bors commented Mar 26, 2015

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

@alexcrichton
Copy link
Member Author

@bors: r+ 7756fe6

@bors
Copy link
Contributor

bors commented Mar 26, 2015

⌛ Testing commit 7756fe6 with merge ff62f95...

bors added a commit that referenced this pull request Mar 26, 2015
@bors
Copy link
Contributor

bors commented Mar 26, 2015

💔 Test failed - cargo-win-64

@alexcrichton
Copy link
Member Author

@bors: retry

On Thu, Mar 26, 2015 at 2:53 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - cargo-win-64
http://buildbot.rust-lang.org/builders/cargo-win-64/builds/577


Reply to this email directly or view it on GitHub
#1405 (comment).

@bors
Copy link
Contributor

bors commented Mar 26, 2015

⚡ Previous build results for cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-32 are reusable. Rebuilding only cargo-win-64...

@bors
Copy link
Contributor

bors commented Mar 26, 2015

☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-32, cargo-win-64

@bors bors merged commit 7756fe6 into rust-lang:master Mar 26, 2015
@alexcrichton alexcrichton deleted the issue-1401 branch March 27, 2015 00:09
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.

Doc test link failure with native dependencies
4 participants