Skip to content

Commit 1864caa

Browse files
luca-barbieriMark-Simulacrum
authored andcommitted
Make panic-unwind a default feature for libstd
x.py sets it unconditionally, so want it for plain "cargo build". We need to load one of the panic runtimes that is in src (vs. pre-built in the compiler's sysroot) to ensure that we don't load libpanic_unwind from the sysroot. That would lead to a load of libcore, also from the sysroot, and create lots of errors about duplicate lang items.
1 parent 3dd500d commit 1864caa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/libstd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ hermit-abi = { version = "0.1.10", features = ['rustc-dep-of-std'] }
4747
wasi = { version = "0.9.0", features = ['rustc-dep-of-std'], default-features = false }
4848

4949
[features]
50-
default = ["std_detect_file_io", "std_detect_dlsym_getauxval"]
50+
default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind"]
5151

5252
backtrace = [
5353
"backtrace_rs/dbghelp", # backtrace/symbolize on MSVC

0 commit comments

Comments
 (0)