Skip to content

Commit a53bd20

Browse files
committed
Auto merge of #51931 - cramertj:rm-libbacktrace, r=alexcrichton
Use in-tree libbacktrace on Fuchsia cc @abarth r? @alexcrichton (welcome back! 😄 )
2 parents 4593564 + 3265189 commit a53bd20

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

Diff for: src/libstd/build.rs

-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ fn main() {
2222
if cfg!(feature = "backtrace") &&
2323
!target.contains("cloudabi") &&
2424
!target.contains("emscripten") &&
25-
!target.contains("fuchsia") &&
2625
!target.contains("msvc") &&
2726
!target.contains("wasm32")
2827
{
@@ -68,10 +67,6 @@ fn main() {
6867
println!("cargo:rustc-link-lib=userenv");
6968
println!("cargo:rustc-link-lib=shell32");
7069
} else if target.contains("fuchsia") {
71-
// use system-provided libbacktrace
72-
if cfg!(feature = "backtrace") {
73-
println!("cargo:rustc-link-lib=backtrace");
74-
}
7570
println!("cargo:rustc-link-lib=zircon");
7671
println!("cargo:rustc-link-lib=fdio");
7772
} else if target.contains("cloudabi") {

0 commit comments

Comments
 (0)