about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-23 00:24:14 +0000
committerbors <bors@rust-lang.org>2015-10-23 00:24:14 +0000
commit414d68ec72a0491f2b3a836524dd7c02cdd5b750 (patch)
tree66b15b3984be647984fc579aa9b3a20fe20af099
parent7beebbe564fa0c93c7c224c75c98a81c23ed42d9 (diff)
parentdd8ae4f64ea8af1705ab23ee822ece70933d9226 (diff)
downloadrust-414d68ec72a0491f2b3a836524dd7c02cdd5b750.tar.gz
rust-414d68ec72a0491f2b3a836524dd7c02cdd5b750.zip
Auto merge of #29216 - steveklabnik:fix_libc, r=alexcrichton
This is needed to release a new version of libc

r? @alexcrichton 
-rw-r--r--src/liblibc/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index a4ee2963b60..212bf4416bd 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -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(not(feature = "cargo-build"), feature(cfg_target_vendor))]
 
 //! Bindings for the C standard library and other platform libraries
 //!