x.py: don't enable -Zconfig-profile or -Zexternal-macro-backtrace with x.py clippy

matthiaskrgr · matthiaskrgr · commit 548958a46046 · 2020-03-20T09:09:09.000+01:00
run clippy on #[cfg(not(bootstrap)] code
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -759,7 +759,8 @@ impl<'a> Builder<'a> {
         };
 
         let mut rustflags = Rustflags::new(&target);
-        if stage != 0 {
+        // x.py with nightly clippy needs to run over #[cfg(not(bootstrap)] code in order to function
+        if stage != 0 || cmd == "clippy" {
             if let Ok(s) = env::var("CARGOFLAGS_NOT_BOOTSTRAP") {
                 cargo.args(s.split_whitespace());
             }

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,8 @@ impl<'a> Builder<'a> {`
`759`	`759`	`};`
`760`	`760`
`761`	`761`	`let mut rustflags = Rustflags::new(&target);`
`762`		`- if stage != 0 {`
	`762`	`+ // x.py with nightly clippy needs to run over #[cfg(not(bootstrap)] code in order to function`
	`763`	`+ if stage != 0 \|\| cmd == "clippy" {`
`763`	`764`	`if let Ok(s) = env::var("CARGOFLAGS_NOT_BOOTSTRAP") {`
`764`	`765`	`cargo.args(s.split_whitespace());`
`765`	`766`	`}`