Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 9 pull requests #64216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

Rollup of 9 pull requests #64216

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0c9aeba
Remove no-prefer-dynamic from valgrind tests
Mark-Simulacrum Sep 1, 2019
991f436
Fix regex replacement in theme detection
GuillaumeGomez Sep 2, 2019
4ffb429
run-pass tests shouldn't have unused contents
Mark-Simulacrum Sep 1, 2019
09a442d
Update test stderr with results of enabling unused lints
Mark-Simulacrum Sep 1, 2019
c86ea34
Ensure all warnings are emitted even on warnings=warn
Mark-Simulacrum Sep 2, 2019
fda251b
Rename --warnings=allow to --warnings=warn
Mark-Simulacrum Sep 2, 2019
485697b
Better way of conditioning the sanitizer builds
infinity0 Sep 5, 2019
27b0946
Thread in-tree information through Mode
Mark-Simulacrum Sep 4, 2019
c6f868f
Move warnings out of rustc wrapper
Mark-Simulacrum Sep 4, 2019
159d249
annotate-snippet emitter: Deal with multispans from macros, too
phansch Sep 5, 2019
022d9c8
Fixed grammar/style in error messages and reblessed tests.
alexreg Sep 1, 2019
0ca645a
annotate-snippet emitter: Update issue number
phansch Sep 6, 2019
ba7d1b8
it's more pythonic to use 'is not None' in python files
Sep 6, 2019
72eca54
Rollup merge of #64067 - Mark-Simulacrum:valgrind-dyn, r=alexcrichton
Centril Sep 6, 2019
65527e2
Rollup merge of #64078 - Mark-Simulacrum:compiletest-lint-unused, r=p…
Centril Sep 6, 2019
71d04f9
Rollup merge of #64096 - GuillaumeGomez:theme-regex-fix, r=Mark-Simul…
Centril Sep 6, 2019
a54ba42
Rollup merge of #64098 - Mark-Simulacrum:always-warn, r=alexcrichton
Centril Sep 6, 2019
64b2e4a
Rollup merge of #64166 - infinity0:master, r=alexcrichton
Centril Sep 6, 2019
abd777f
Rollup merge of #64189 - phansch:add_macros_support, r=estebank
Centril Sep 6, 2019
21ab7bc
Rollup merge of #64202 - alexreg:rush-pr-1, r=Centril
Centril Sep 6, 2019
f9aa5d6
Rollup merge of #64206 - phansch:update_issue_number, r=varkor
Centril Sep 6, 2019
4ac73a1
Rollup merge of #64208 - guanqun:py-is-not-none, r=matklad
Centril Sep 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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.
  • Loading branch information
@infinity0
infinity0 committed Sep 5, 2019
commit 485697bf42cc6a03712e82e69c8f2357a2576454
1 change: 1 addition & 0 deletions src/bootstrap/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions src/librustc_asan/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ use build_helper::sanitizer_lib_boilerplate;
use cmake::Config;

fn main() {
if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) {
return;
}
if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
build_helper::restore_library_path();

Expand Down
3 changes: 3 additions & 0 deletions src/librustc_lsan/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ use build_helper::sanitizer_lib_boilerplate;
use cmake::Config;

fn main() {
if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) {
return;
}
if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
build_helper::restore_library_path();

Expand Down
3 changes: 3 additions & 0 deletions src/librustc_msan/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ use build_helper::sanitizer_lib_boilerplate;
use cmake::Config;

fn main() {
if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) {
return;
}
if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
build_helper::restore_library_path();

Expand Down
3 changes: 3 additions & 0 deletions src/librustc_tsan/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ use build_helper::sanitizer_lib_boilerplate;
use cmake::Config;

fn main() {
if env::var("RUSTC_BUILD_SANITIZERS") != Ok("1".to_string()) {
return;
}
if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
build_helper::restore_library_path();

Expand Down