Skip to content

backport rust-lang/rust changes #140

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
merged 6 commits into from
Feb 7, 2017
Merged

backport rust-lang/rust changes #140

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b914905
Don't build gcc_personality_v0.c on NetBSD either
Feb 6, 2017
c30dcb0
Don't build any native compiler-builtin components for emscripten
Feb 6, 2017
6d3cab2
libcompiler_builtins: Don't build emutls.c
Feb 6, 2017
03aa2ef
travis: Expand the `cross` linux image
Feb 6, 2017
7cac962
std: Remove unused objects from compiler-builtins
Feb 6, 2017
f7bd48e
target.contains -> target_os ==
Feb 6, 2017
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
19 changes: 7 additions & 12 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ fn main() {
println!("cargo:rerun-if-changed=build.rs");

let target = env::var("TARGET").unwrap();

// Emscripten's runtime includes all the builtins
if target.contains("emscripten") {
return;
}

let Cfg { ref target_arch, ref target_os, ref target_env, ref target_vendor, .. } =
Cfg::new(&target).unwrap_or_else(|e| {
writeln!(io::stderr(), "{}", e).ok();
Expand Down Expand Up @@ -110,7 +116,6 @@ fn main() {
"addvdi3.c",
"addvsi3.c",
"apple_versioning.c",
"clear_cache.c",
"clzdi2.c",
"clzsi2.c",
"cmpdi2.c",
Expand Down Expand Up @@ -176,12 +181,10 @@ fn main() {

if target_os != "ios" {
sources.extend(&["absvti2.c",
"addtf3.c",
"addvti3.c",
"clzti2.c",
"cmpti2.c",
"ctzti2.c",
"divtf3.c",
"ffsti2.c",
"fixdfti.c",
"fixsfti.c",
Expand All @@ -195,16 +198,12 @@ fn main() {
"floatuntidf.c",
"floatuntisf.c",
"floatuntixf.c",
"multf3.c",
"mulvti3.c",
"negti2.c",
"negvti2.c",
"parityti2.c",
"popcountti2.c",
"powitf2.c",
"subtf3.c",
"subvti3.c",
"trampoline_setup.c",
"ucmpti2.c"]);
}

Expand All @@ -217,16 +216,12 @@ fn main() {
"atomic_thread_fence.c"]);
}

if target_os != "windows" && target_os != "none" {
sources.extend(&["emutls.c"]);
}

if target_env == "msvc" {
if target_arch == "x86_64" {
sources.extend(&["x86_64/floatdidf.c", "x86_64/floatdisf.c", "x86_64/floatdixf.c"]);
}
} else {
if target_os != "freebsd" {
if target_os != "freebsd" && target_os != "netbsd" {
sources.extend(&["gcc_personality_v0.c"]);
}

Expand Down