From 548958a460467e616fdc78e71cbbb86ece89508c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Sun, 23 Feb 2020 01:12:02 +0100
Subject: [PATCH] x.py: don't enable -Zconfig-profile or
 -Zexternal-macro-backtrace with x.py clippy

run clippy on #[cfg(not(bootstrap)] code
---
 src/bootstrap/builder.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 602e4511ea583..acaf9cc6f3290 100644
--- 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());
             }