OpenE2K/libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use #[link(cfg(..))] in preparation for libstd

Browse Source 
In preparation for rust-lang/rust#37545 this is adding the appropriate
directives to libc to get included.
This commit is contained in:
Alex Crichton 2016-10-31 16:44:29 -07:00
parent b347e64ab1
commit f9323d1a0a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib.rs
View File

@ -75,6 +75,7 @@
// Attributes needed when building as part of the standard library
#![cfg_attr(stdbuild, feature(no_std, core, core_slice_ext, staged_api, custom_attribute, cfg_target_vendor))]
#![cfg_attr(stdbuild, feature(link_cfg))]
#![cfg_attr(stdbuild, no_std)]
#![cfg_attr(stdbuild, staged_api)]
#![cfg_attr(stdbuild, allow(warnings))]

3
src/unix/mod.rs
View File

@ -205,7 +205,8 @@ cfg_if! {
// cargo build, don't pull in anything extra as the libstd dep
// already pulls in all libs.
} else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] {
#[link(name = "c", kind = "static")]
#[link(name = "c", kind = "static", cfg(target_feature = "crt-static"))]
#[link(name = "c", cfg(not(target_feature = "crt-static")))]
extern {}
} else if #[cfg(target_os = "emscripten")] {
#[link(name = "c")]

5
src/windows.rs
View File

@ -146,8 +146,9 @@ pub const ENOTEMPTY: ::c_int = 41;
pub const EILSEQ: ::c_int = 42;
pub const STRUNCATE: ::c_int = 80;
#[cfg(target_env = "msvc")] // " if " -- appease style checker
#[link(name = "msvcrt")]
#[cfg(all(target_env = "msvc", stdbuild))] // " if " -- appease style checker
#[link(name = "msvcrt", cfg(not(target_feature = "crt-static")))]
#[link(name = "libcmt", cfg(target_feature = "crt-static"))]
extern {}
extern {