From 485697bf42cc6a03712e82e69c8f2357a2576454 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Thu, 5 Sep 2019 00:14:09 -0700 Subject: Better way of conditioning the sanitizer builds Previously the build would take the presence of the LLVM_CONFIG envvar to mean that the sanitizers should be built, but this is a common envvar that could be set for reasons unrelated to the rustc sanitizers. This commit adds a new envvar RUSTC_BUILD_SANITIZERS and uses it instead. --- src/bootstrap/compile.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/bootstrap') diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 9d57a4f00d7..9a964457ef2 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -212,6 +212,7 @@ pub fn std_cargo(builder: &Builder<'_>, emscripten: false, }); cargo.env("LLVM_CONFIG", llvm_config); + cargo.env("RUSTC_BUILD_SANITIZERS", "1"); } cargo.arg("--features").arg(features) -- cgit 1.4.1-3-g733a5