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
This commit is contained in:
bors 2017-03-08 13:00:13 +00:00
commit ee60afa094
6 changed files with 9 additions and 9 deletions

View File

@ -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");

View File

@ -7,6 +7,7 @@ version = "0.0.0"
[lib]
name = "rustc_asan"
path = "lib.rs"
test = false
[build-dependencies]
build_helper = { path = "../build_helper" }

View File

@ -7,6 +7,7 @@ version = "0.0.0"
[lib]
name = "rustc_lsan"
path = "lib.rs"
test = false
[build-dependencies]
build_helper = { path = "../build_helper" }

View File

@ -7,6 +7,7 @@ version = "0.0.0"
[lib]
name = "rustc_msan"
path = "lib.rs"
test = false
[build-dependencies]
build_helper = { path = "../build_helper" }

View File

@ -7,6 +7,7 @@ version = "0.0.0"
[lib]
name = "rustc_tsan"
path = "lib.rs"
test = false
[build-dependencies]
build_helper = { path = "../build_helper" }

View File

@ -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"]