Skip to content

Fix build of libc on stable #29216

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

Merged
merged 1 commit into from
Oct 23, 2015
Merged

Fix build of libc on stable #29216

merged 1 commit into from
Oct 23, 2015

Conversation

steveklabnik
Copy link
Member

This is needed to release a new version of libc

r? @alexcrichton

@@ -24,7 +24,7 @@
html_playground_url = "https://play.rust-lang.org/",
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/")]
#![cfg_attr(test, feature(test))]
#![feature(cfg_target_vendor)]
#![cfg_attr(cfg_target_vendor, feature(cfg_target_vendor))]
Copy link
Member

Choose a reason for hiding this comment

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

I think this should be not(feature = "cargo-build") instead of cfg_target_vendor, right? (e.g. similar to the above feature annotation)

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah! I was looking at line 26 for inspiration, not 15.

@steveklabnik
Copy link
Member Author

@alexcrichton updated! I also moved them next to each other, since they're related.

@alexcrichton
Copy link
Member

Hm did this go awry? There's no longer a feature(cfg_target_vendor)

@steveklabnik steveklabnik force-pushed the fix_libc branch 2 times, most recently from fc5dc13 to dd8ae4f Compare October 22, 2015 15:43
This is needed to release a new version of libc
@alexcrichton
Copy link
Member

@bors: r+ dd8ae4f

@bors
Copy link
Collaborator

bors commented Oct 23, 2015

⌛ Testing commit dd8ae4f with merge 414d68e...

bors added a commit that referenced this pull request Oct 23, 2015
This is needed to release a new version of libc

r? @alexcrichton
@bors bors merged commit dd8ae4f into rust-lang:master Oct 23, 2015
@steveklabnik steveklabnik deleted the fix_libc branch June 19, 2016 20:32
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.

3 participants