Skip to content

Commit 1afdd45

Browse files
committed
Update how wasm-component-ld is built
Reuse preexisting macro and switch it to a "bootstrap tool" to try to resolve build issues.
1 parent 2a3e22b commit 1afdd45

File tree

1 file changed

+1
-28
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+1
-28
lines changed

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

+1-28
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ bootstrap_tool!(
337337
RustdocGUITest, "src/tools/rustdoc-gui-test", "rustdoc-gui-test", is_unstable_tool = true, allow_features = "test";
338338
CoverageDump, "src/tools/coverage-dump", "coverage-dump";
339339
RustcPerfWrapper, "src/tools/rustc-perf-wrapper", "rustc-perf-wrapper";
340+
WasmComponentLd, "src/tools/wasm-component-ld", "wasm-component-ld";
340341
);
341342

342343
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
@@ -701,34 +702,6 @@ impl Step for LldWrapper {
701702
}
702703
}
703704

704-
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
705-
pub struct WasmComponentLd {
706-
pub compiler: Compiler,
707-
pub target: TargetSelection,
708-
}
709-
710-
impl Step for WasmComponentLd {
711-
type Output = PathBuf;
712-
713-
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
714-
run.never()
715-
}
716-
717-
fn run(self, builder: &Builder<'_>) -> PathBuf {
718-
builder.ensure(ToolBuild {
719-
compiler: self.compiler,
720-
target: self.target,
721-
tool: "wasm-component-ld",
722-
mode: Mode::ToolStd,
723-
path: "src/tools/wasm-component-ld",
724-
source_type: SourceType::InTree,
725-
extra_features: Vec::new(),
726-
allow_features: "",
727-
cargo_args: Vec::new(),
728-
})
729-
}
730-
}
731-
732705
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
733706
pub struct RustAnalyzer {
734707
pub compiler: Compiler,

0 commit comments

Comments
 (0)