diff options
| author | bors <bors@rust-lang.org> | 2018-07-02 06:32:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-02 06:32:16 +0000 |
| commit | a53bd20fae43cb35d394d7823aacdf52ccbd19cb (patch) | |
| tree | acc8f41879cf9393ccc106db5ff07a4d35f45662 /src/libstd | |
| parent | 45935640f058405c95c96308f3acfd5ac1535698 (diff) | |
| parent | 3265189b68c82ea5ccab663a8db7f0449fa90667 (diff) | |
| download | rust-a53bd20fae43cb35d394d7823aacdf52ccbd19cb.tar.gz rust-a53bd20fae43cb35d394d7823aacdf52ccbd19cb.zip | |
Auto merge of #51931 - cramertj:rm-libbacktrace, r=alexcrichton
Use in-tree libbacktrace on Fuchsia cc @abarth r? @alexcrichton (welcome back! :smile: )
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/build.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs index c001e4e8ceb..9d5aebde625 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -22,7 +22,6 @@ fn main() { if cfg!(feature = "backtrace") && !target.contains("cloudabi") && !target.contains("emscripten") && - !target.contains("fuchsia") && !target.contains("msvc") && !target.contains("wasm32") { @@ -68,10 +67,6 @@ fn main() { println!("cargo:rustc-link-lib=userenv"); println!("cargo:rustc-link-lib=shell32"); } 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=fdio"); } else if target.contains("cloudabi") { |