wix: allow to skip more components

1 files changed, 30 insertions, 2 deletions

diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index b6c5a5add01..33155ab3795 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -1856,7 +1856,7 @@ impl Step for Extended {
                     .arg("-out")
                     .arg(&output)
                     .arg(input);
-                add_env(builder, &mut cmd, target);
+                add_env(builder, &mut cmd, target, &built_tools);
 
                 if built_tools.contains("clippy") {
                     cmd.arg("-dClippyDir=clippy");
@@ -1960,7 +1960,14 @@ impl Step for Extended {
     }
 }
 
-fn add_env(builder: &Builder<'_>, cmd: &mut BootstrapCommand, target: TargetSelection) {
+fn add_env(
+    builder: &Builder<'_>,
+    cmd: &mut BootstrapCommand,
+    target: TargetSelection,
+    built_tools: &HashSet<&'static str>,
+) {
+    // envs for wix should be always defined, even if not used
+    // FIXME: is they affect ccache?
     let mut parts = builder.version.split('.');
     cmd.env("CFG_RELEASE_INFO", builder.rust_version())
         .env("CFG_RELEASE_NUM", &builder.version)
@@ -1981,6 +1988,27 @@ fn add_env(builder: &Builder<'_>, cmd: &mut BootstrapCommand, target: TargetSele
     } else {
         cmd.env("CFG_MINGW", "0").env("CFG_ABI", "MSVC");
     }
+
+    if built_tools.contains("rustfmt") {
+        cmd.env("CFG_RUSTFMT", "1");
+    } else {
+        cmd.env("CFG_RUSTFMT", "0");
+    }
+    if built_tools.contains("clippy") {
+        cmd.env("CFG_CLIPPY", "1");
+    } else {
+        cmd.env("CFG_CLIPPY", "0");
+    }
+    if built_tools.contains("miri") {
+        cmd.env("CFG_MIRI", "1");
+    } else {
+        cmd.env("CFG_MIRI", "0");
+    }
+    if built_tools.contains("rust-analyzer") {
+        cmd.env("CFG_RA", "1");
+    } else {
+        cmd.env("CFG_RA", "0");
+    }
 }
 
 fn install_llvm_file(