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/rustc | |
| 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/rustc')
| -rw-r--r-- | src/rustc/std_shim/Cargo.toml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rustc/std_shim/Cargo.toml b/src/rustc/std_shim/Cargo.toml index 58a7bd8a1cb..b4b7acc4e66 100644 --- a/src/rustc/std_shim/Cargo.toml +++ b/src/rustc/std_shim/Cargo.toml @@ -45,6 +45,7 @@ core = { path = "../../libcore" } # Reexport features from std [features] -jemalloc = ["std/jemalloc"] -debug-jemalloc = ["std/debug-jemalloc"] backtrace = ["std/backtrace"] +debug-jemalloc = ["std/debug-jemalloc"] +jemalloc = ["std/jemalloc"] +panic-unwind = ["std/panic-unwind"] |