bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #64166 - infinity0:master, r=alexcrichton

Browse source 
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.

This PR or similar will be necessary in order to work correctly with https://github.com/rust-lang-nursery/compiler-builtins/pull/296
This commit is contained in:
Mazdak Farrokhzad 2019-09-06 19:00:46 +02:00 • committed by GitHub
commit 8bbd71b99a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/bootstrap/compile.rs
View file

@ -212,6 +212,7 @@ pub fn std_cargo(builder: &Builder<'_>,
emscripten: false, emscripten: false,
}); });
cargo.env("LLVM_CONFIG", llvm_config); cargo.env("LLVM_CONFIG", llvm_config);
cargo.env("RUSTC_BUILD_SANITIZERS", "1");
} }
cargo.arg("--features").arg(features) cargo.arg("--features").arg(features)

3
src/librustc_asan/build.rs
View file

@ -4,6 +4,9 @@ use build_helper::sanitizer_lib_boilerplate;
use cmake::Config; use cmake::Config;
fn main() { fn main() {
if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) {
return;
}
if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
build_helper::restore_library_path(); build_helper::restore_library_path();

3
src/librustc_lsan/build.rs
View file

@ -4,6 +4,9 @@ use build_helper::sanitizer_lib_boilerplate;
use cmake::Config; use cmake::Config;
fn main() { fn main() {
if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) {
return;
}
if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
build_helper::restore_library_path(); build_helper::restore_library_path();

3
src/librustc_msan/build.rs
View file

@ -4,6 +4,9 @@ use build_helper::sanitizer_lib_boilerplate;
use cmake::Config; use cmake::Config;
fn main() { fn main() {
if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) {
return;
}
if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
build_helper::restore_library_path(); build_helper::restore_library_path();

3
src/librustc_tsan/build.rs
View file

@ -4,6 +4,9 @@ use build_helper::sanitizer_lib_boilerplate;
use cmake::Config; use cmake::Config;
fn main() { fn main() {
if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) {
return;
}
if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
build_helper::restore_library_path(); build_helper::restore_library_path();