Split Build::tool_enabled to with/without extended

This commit repurposes the bootstrap `Build::tool_enabled` helper to
just check the set of enabled tools. The preexisting check for
`extended` as well is refactored to a separate method
`Build::extended_tool_enabled`.

The purpose for this change is to support
`./x.py test --target wasm32-wasip2` which requires the
`wasm-component-ld` tool unconditionally regardless of whether
`extended` is supported or not.

Author: alexcrichton

src/bootstrap/src/core/build_steps/tool.rs

@@ -810,7 +810,7 @@ impl Step for Cargo {
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
         let builder = run.builder;
-        run.path("src/tools/cargo").default_condition(builder.tool_enabled("cargo"))
+        run.path("src/tools/cargo").default_condition(builder.extended_tool_enabled("cargo"))
     }
 
     fn make_run(run: RunConfig<'_>) {
@@ -1032,7 +1032,8 @@ impl Step for RustAnalyzer {
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
         let builder = run.builder;
-        run.path("src/tools/rust-analyzer").default_condition(builder.tool_enabled("rust-analyzer"))
+        run.path("src/tools/rust-analyzer")
+            .default_condition(builder.extended_tool_enabled("rust-analyzer"))
     }
 
     fn make_run(run: RunConfig<'_>) {
@@ -1089,8 +1090,8 @@ impl Step for RustAnalyzerProcMacroSrv {
         run.path("src/tools/rust-analyzer")
             .path("src/tools/rust-analyzer/crates/proc-macro-srv-cli")
             .default_condition(
-                builder.tool_enabled("rust-analyzer")
-                    || builder.tool_enabled("rust-analyzer-proc-macro-srv"),
+                builder.extended_tool_enabled("rust-analyzer")
+                    || builder.extended_tool_enabled("rust-analyzer-proc-macro-srv"),
             )
     }
 
@@ -1176,7 +1177,7 @@ impl Step for LlvmBitcodeLinker {
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
         let builder = run.builder;
         run.path("src/tools/llvm-bitcode-linker")
-            .default_condition(builder.tool_enabled("llvm-bitcode-linker"))
+            .default_condition(builder.extended_tool_enabled("llvm-bitcode-linker"))
     }
 
     fn make_run(run: RunConfig<'_>) {

src/bootstrap/src/lib.rs

@@ -1485,10 +1485,12 @@ impl Build {
     ///
     /// This requires that both the `extended` key is set and the `tools` key is
     /// either unset or specifically contains the specified tool.
+    fn extended_tool_enabled(&self, tool: &str) -> bool {
+        self.config.extended && self.tool_enabled(tool)
+    }
+
+    /// Returns whether the specified tool is configured as part of this build.
     fn tool_enabled(&self, tool: &str) -> bool {
-        if !self.config.extended {
-            return false;
-        }
         match &self.config.tools {
             Some(set) => set.contains(tool),
             None => true,