M-Labs/compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #189 - tamird:update-comment-rustbuild, r=alexcrichton

Browse Source 
Update rustbuild commentary

r? @nikomatsakis

This is the reason that https://github.com/rust-lang/rust/pull/44509 doesn't work - the `rustbuild` feature _is_ actually used, it was just incorrectly documented here and I missed it.
This commit is contained in:
bors 2017-09-14 00:46:30 +00:00
commit ef4951582f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.rs
View File

@ -4106,9 +4106,11 @@ mod c {
// also needs to satisfy intrinsics that jemalloc or C in general may // also needs to satisfy intrinsics that jemalloc or C in general may
// need, so include a few more that aren't typically needed by // need, so include a few more that aren't typically needed by
// LLVM/Rust. // LLVM/Rust.
sources.extend(&[ if cfg!(feature = "rustbuild") {
"ffsdi2.c", sources.extend(&[
]); "ffsdi2.c",
]);
}
if target_os != "ios" { if target_os != "ios" {
sources.extend( sources.extend(
@ -4359,7 +4361,9 @@ mod c {
sources.remove(&["aeabi_cdcmp", "aeabi_cfcmp"]); sources.remove(&["aeabi_cdcmp", "aeabi_cfcmp"]);
} }
let root = if env::var_os("CARGO_FEATURE_RUSTBUILD").is_some() { // When compiling in rustbuild (the rust-lang/rust repo) this build
// script runs from a directory other than this root directory.
let root = if cfg!(feature = "rustbuild") {
Path::new("../../libcompiler_builtins") Path::new("../../libcompiler_builtins")
} else { } else {
Path::new(".") Path::new(".")