Skip to content

Implement ToolTarget and port RemoteTestServer and WasmComponentLd to it #143581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Implement ToolTarget and port RemoteTestServer and WasmComponentLd to it #143581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8be2d8
Rename `compiler` to `build_compiler`
Kobzol Jun 18, 2025
63f7241
Introduce `ToolTarget` for cross-compilable tools that can be built w…
Kobzol Jul 7, 2025
1239b99
Port `RemoteTestServer` to `ToolTarget`
Kobzol Jul 7, 2025
46851d3
Make `WasmComponentLd` a `ToolTarget` tool
Kobzol Jul 7, 2025
759366b
Handle `ToolTarget` when setting `RUSTC_FORCE_UNSTABLE`
Kobzol Jul 7, 2025
51d48f0
Use raw stage0 sysroot for `ToolTarget` tools
Kobzol Jul 7, 2025
4fddfd1
Add cross-complation comment
Kobzol Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/bootstrap/src/core/build_steps/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2929,7 +2929,8 @@ impl Step for RemoteCopyLibs {

builder.info(&format!("REMOTE copy libs to emulator ({target})"));

let remote_test_server = builder.ensure(tool::RemoteTestServer { compiler, target });
let remote_test_server =
builder.ensure(tool::RemoteTestServer { build_compiler: compiler, target });

// Spawn the emulator and wait for it to come online
let tool = builder.tool_exe(Tool::RemoteTestClient);
Expand Down
24 changes: 15 additions & 9 deletions src/bootstrap/src/core/build_steps/tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ impl Step for ToolBuild {
builder.std(self.build_compiler, target);
}
}
Mode::ToolBootstrap => {} // uses downloaded stage0 compiler libs
Mode::ToolBootstrap | Mode::ToolTarget => {} // uses downloaded stage0 compiler libs
_ => panic!("unexpected Mode for tool build"),
}

Expand Down Expand Up @@ -196,7 +196,7 @@ impl Step for ToolBuild {
Kind::Build,
self.mode,
self.tool,
self.build_compiler.stage,
self.build_compiler.stage + 1,
Copy link
Member

@jieyouxu jieyouxu Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remark: this is because it's a product of the stage 0 rustc that is not the stage 0 library

&self.build_compiler.host,
&self.target,
);
Expand Down Expand Up @@ -367,12 +367,14 @@ pub(crate) fn get_tool_rustc_compiler(

/// Returns a compiler that is able to compile a `ToolTarget` tool for the given `target`.
pub(crate) fn get_tool_target_compiler(builder: &Builder<'_>, target: TargetSelection) -> Compiler {
Copy link
Member

@jieyouxu jieyouxu Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: this isn't quite obvious, because in the cross-compile case, we'll also have to ensure target std as a side-effect, right? I don't have a better name for this just yet, so not a blocker.

I can see why we might want to have some kind of "proof of std artifacts getting built".

Copy link
Member Author

@Kobzol Kobzol Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would indeed be nice, but that's a massive refactoring. I'm continuously thinking about how to approach it. The attachment of a std to Compiler in bootstrap is currently fully implicit, so this just does what the rest of bootstrap does.

Copy link
Member

@jieyouxu jieyouxu Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this was more of a question, and not a blocking change request.

if builder.host_target == target {
let compiler = if builder.host_target == target {
builder.compiler(0, builder.host_target)
} else {
// FIXME: should this be builder.top_stage to avoid rebuilds?
builder.compiler(1, target)
}
builder.compiler(1, builder.host_target)
};
builder.std(compiler, target);
compiler
}

/// Links a built tool binary with the given `name` from the build directory to the
Expand Down Expand Up @@ -647,7 +649,7 @@ impl Step for ErrorIndex {

#[derive(Debug, Clone, Hash, PartialEq, Eq)]
pub struct RemoteTestServer {
pub compiler: Compiler,
pub build_compiler: Compiler,
pub target: TargetSelection,
}

Expand All @@ -660,17 +662,17 @@ impl Step for RemoteTestServer {

fn make_run(run: RunConfig<'_>) {
run.builder.ensure(RemoteTestServer {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.host_target),
build_compiler: get_tool_target_compiler(run.builder, run.target),
target: run.target,
});
}

fn run(self, builder: &Builder<'_>) -> ToolBuildResult {
builder.ensure(ToolBuild {
build_compiler: self.compiler,
build_compiler: self.build_compiler,
target: self.target,
tool: "remote-test-server",
mode: Mode::ToolStd,
mode: Mode::ToolTarget,
path: "src/tools/remote-test-server",
source_type: SourceType::InTree,
extra_features: Vec::new(),
Expand All @@ -679,6 +681,10 @@ impl Step for RemoteTestServer {
artifact_kind: ToolArtifactKind::Binary,
})
}

fn metadata(&self) -> Option<StepMetadata> {
Some(StepMetadata::build("remote-test-server", self.target).built_by(self.build_compiler))
}
}

#[derive(Debug, Clone, Hash, PartialEq, Eq, Ord, PartialOrd)]
Expand Down