Skip to content

Commit 824002b

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 674267e commit 824002b

File tree

1 file changed

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

1 file changed

+1
-28
lines changed

Diff for: src/bootstrap/src/core/build_steps/tool.rs

+1-28
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ bootstrap_tool!(
329329
GenerateWindowsSys, "src/tools/generate-windows-sys", "generate-windows-sys";
330330
RustdocGUITest, "src/tools/rustdoc-gui-test", "rustdoc-gui-test", is_unstable_tool = true, allow_features = "test";
331331
CoverageDump, "src/tools/coverage-dump", "coverage-dump";
332+
WasmComponentLd, "src/tools/wasm-component-ld", "wasm-component-ld";
332333
);
333334

334335
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
@@ -696,34 +697,6 @@ impl Step for LldWrapper {
696697
}
697698
}
698699

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

0 commit comments

Comments
 (0)