diff options
| author | bors <bors@rust-lang.org> | 2017-03-08 13:00:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-08 13:00:13 +0000 |
| commit | ee60afa09465cedfa08be04e59b6a8ccfd54685f (patch) | |
| tree | 538d92faf2d33667830a7e91b4e06abeef514a43 /src/libstd | |
| parent | f91c3f675517ed9676085d75d682f393b4108f96 (diff) | |
| parent | 28baa27570a80f7e8e248bf8ca1dbbea6cd1ecba (diff) | |
| download | rust-ee60afa09465cedfa08be04e59b6a8ccfd54685f.tar.gz rust-ee60afa09465cedfa08be04e59b6a8ccfd54685f.zip | |
Auto merge of #39860 - japaric:san, r=alexcrichton
cleanup: remove the *san Cargo features from std these belong to a previous iteration of the sanitizer implementation r? @alexcrichton cc @whitequark
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 2ba7517d3d2..46511452a72 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -24,22 +24,18 @@ std_unicode = { path = "../libstd_unicode" } unwind = { path = "../libunwind" } [target.x86_64-unknown-linux-gnu.dependencies] -rustc_asan = { path = "../librustc_asan", optional = true } -rustc_lsan = { path = "../librustc_lsan", optional = true } -rustc_msan = { path = "../librustc_msan", optional = true } -rustc_tsan = { path = "../librustc_tsan", optional = true } +rustc_asan = { path = "../librustc_asan" } +rustc_lsan = { path = "../librustc_lsan" } +rustc_msan = { path = "../librustc_msan" } +rustc_tsan = { path = "../librustc_tsan" } [build-dependencies] build_helper = { path = "../build_helper" } gcc = "0.3.27" [features] -asan = ["rustc_asan"] backtrace = [] debug-jemalloc = ["alloc_jemalloc/debug"] jemalloc = ["alloc_jemalloc"] force_alloc_system = [] -lsan = ["rustc_lsan"] -msan = ["rustc_msan"] panic-unwind = ["panic_unwind"] -tsan = ["rustc_tsan"] |