diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2016-11-23 21:49:54 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2016-11-23 21:49:54 -0500 |
| commit | ba07a1b58d72fb460734014f5d314a206dad7359 (patch) | |
| tree | dd6bec2baa77696219650154d93b10cdf501843d /src/libstd | |
| parent | 127a83df6615d09cda6ed9b53f7daba2d78c925d (diff) | |
| download | rust-ba07a1b58d72fb460734014f5d314a206dad7359.tar.gz rust-ba07a1b58d72fb460734014f5d314a206dad7359.zip | |
std: make compilation of libpanic_unwind optional via a Cargo feature
with this feature disabled, you can (Cargo) compile std with "panic=abort" rustbuild will build std with this feature enabled, to maintain the status quo fixes #37252
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 21e6acc37f3..b9f52e20fdd 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -13,7 +13,7 @@ crate-type = ["dylib", "rlib"] alloc = { path = "../liballoc" } alloc_jemalloc = { path = "../liballoc_jemalloc", optional = true } alloc_system = { path = "../liballoc_system" } -panic_unwind = { path = "../libpanic_unwind" } +panic_unwind = { path = "../libpanic_unwind", optional = true } panic_abort = { path = "../libpanic_abort" } collections = { path = "../libcollections" } core = { path = "../libcore" } @@ -29,5 +29,6 @@ gcc = "0.3.27" [features] backtrace = [] -jemalloc = ["alloc_jemalloc"] debug-jemalloc = ["alloc_jemalloc/debug"] +jemalloc = ["alloc_jemalloc"] +panic-unwind = ["panic_unwind"] |