OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #51931 - cramertj:rm-libbacktrace, r=alexcrichton

Browse Source 
Use in-tree libbacktrace on Fuchsia

cc @abarth

r? @alexcrichton
(welcome back! 😄 )
This commit is contained in:
bors 2018-07-02 06:32:16 +00:00
commit a53bd20fae
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libstd/build.rs
View File

@ -22,7 +22,6 @@ fn main() {
if cfg!(feature = "backtrace") && if cfg!(feature = "backtrace") &&
!target.contains("cloudabi") && !target.contains("cloudabi") &&
!target.contains("emscripten") && !target.contains("emscripten") &&
!target.contains("fuchsia") &&
!target.contains("msvc") && !target.contains("msvc") &&
!target.contains("wasm32") !target.contains("wasm32")
{ {
@ -68,10 +67,6 @@ fn main() {
println!("cargo:rustc-link-lib=userenv"); println!("cargo:rustc-link-lib=userenv");
println!("cargo:rustc-link-lib=shell32"); println!("cargo:rustc-link-lib=shell32");
} else if target.contains("fuchsia") { } else if target.contains("fuchsia") {
// use system-provided libbacktrace
if cfg!(feature = "backtrace") {
println!("cargo:rustc-link-lib=backtrace");
}
println!("cargo:rustc-link-lib=zircon"); println!("cargo:rustc-link-lib=zircon");
println!("cargo:rustc-link-lib=fdio"); println!("cargo:rustc-link-lib=fdio");
} else if target.contains("cloudabi") { } else if target.contains("cloudabi") {