Skip to content

Update rustbuild commentary #189

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.

Sign up for GitHub

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
bors merged 1 commit into from
Sep 14, 2017
Merged

Update rustbuild commentary #189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4106,9 +4106,11 @@ mod c {
// also needs to satisfy intrinsics that jemalloc or C in general may
// need, so include a few more that aren't typically needed by
// LLVM/Rust.
sources.extend(&[
"ffsdi2.c",
]);
if cfg!(feature = "rustbuild") {
sources.extend(&[
"ffsdi2.c",
]);
}

if target_os != "ios" {
sources.extend(
Expand Down Expand Up @@ -4359,7 +4361,9 @@ mod c {
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")
} else {
Path::new(".")
Expand Down