Skip to content

Commit

Permalink
Auto merge of rust-lang#74540 - alexcrichton:std-no-backtrace, r=Mark…
Browse files Browse the repository at this point in the history
…-Simulacrum

std: Fix compilation without backtrace feature

This should hopefully handle rust-lang#74484 but in any case fixes compilation of
the standard library without the `backtrace` feature. The need for this
feature is somewhat unclear now because the `backtrace` crate should
always compile (no more C code!) but we can handle that later if
necessary.
  • Loading branch information
bors committed Jul 20, 2020
2 parents 891e6fe + 028f8d7 commit 05630b0
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/libstd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ hashbrown = { version = "0.6.2", default-features = false, features = ['rustc-de

# Dependencies of the `backtrace` crate
addr2line = { version = "0.13.0", optional = true, default-features = false }
rustc-demangle = { version = "0.1.4", optional = true }
rustc-demangle = { version = "0.1.4", features = ['rustc-dep-of-std'] }
miniz_oxide = { version = "0.4.0", optional = true, default-features = false }
[dependencies.object]
version = "0.20"
Expand Down Expand Up @@ -55,7 +55,6 @@ backtrace = [
"gimli-symbolize",
'addr2line/rustc-dep-of-std',
'object/rustc-dep-of-std',
'rustc-demangle/rustc-dep-of-std',
'miniz_oxide/rustc-dep-of-std',
]
gimli-symbolize = []
Expand Down

0 comments on commit 05630b0

Please sign in to comment.