diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2017-02-15 17:00:41 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2017-03-05 14:25:47 -0500 |
| commit | 872a0ebf2170c8b3e8ac665c41270e83cb9105ce (patch) | |
| tree | f6b550283ed5d99eb724ca8616401d57a26c4ca1 | |
| parent | ba07bd5d23aced6d4baa5696213b11ca832c1a5d (diff) | |
| download | rust-872a0ebf2170c8b3e8ac665c41270e83cb9105ce.tar.gz rust-872a0ebf2170c8b3e8ac665c41270e83cb9105ce.zip | |
cleanup: remove the *san Cargo features from std
these belong to a previous iteration of the sanitizer implementation
| -rw-r--r-- | src/bootstrap/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/Cargo.toml | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 98b68d870d3..071d0b0b090 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -613,7 +613,7 @@ impl Build { /// Get the space-separated set of activated features for the standard /// library. fn std_features(&self) -> String { - let mut features = "panic-unwind asan lsan msan tsan".to_string(); + let mut features = "panic-unwind".to_string(); if self.config.debug_jemalloc { features.push_str(" debug-jemalloc"); 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"] |