diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2020-04-10 22:42:20 +0200 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-04-11 17:49:16 -0400 |
| commit | 1864caaaa4d283143eb5e267e5cb46fa0500434a (patch) | |
| tree | 251cba7c1c545d5c9a7fb944a6a27a15380d6235 /src/libstd | |
| parent | 3dd500de373757fd2b118db0c999e48dd01ff894 (diff) | |
| download | rust-1864caaaa4d283143eb5e267e5cb46fa0500434a.tar.gz rust-1864caaaa4d283143eb5e267e5cb46fa0500434a.zip | |
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.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 3a83f3f569a..ceb39c01c67 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -47,7 +47,7 @@ hermit-abi = { version = "0.1.10", features = ['rustc-dep-of-std'] } wasi = { version = "0.9.0", features = ['rustc-dep-of-std'], default-features = false } [features] -default = ["std_detect_file_io", "std_detect_dlsym_getauxval"] +default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind"] backtrace = [ "backtrace_rs/dbghelp", # backtrace/symbolize on MSVC |