Skip to content

Moved build-script bins to deps directory #16515

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

Merged
epage merged 1 commit into from
Jan 15, 2026
+11 −11
Merged

Moved build-script bins to deps directory #16515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/cargo/core/compiler/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,15 +369,15 @@ impl BuildDirLayout {
/// Fetch the build script path.
pub fn build_script(&self, pkg_dir: &str) -> PathBuf {
if self.is_new_layout {
self.build_unit(pkg_dir).join("build-script")
self.deps(pkg_dir)
} else {
self.build().join(pkg_dir)
}
}
/// Fetch the build script execution path.
pub fn build_script_execution(&self, pkg_dir: &str) -> PathBuf {
if self.is_new_layout {
self.build_unit(pkg_dir).join("build-script-execution")
self.build_unit(pkg_dir).join("build-script")
Copy link
Contributor

@epage epage Jan 15, 2026

Choose a reason for hiding this comment

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

I might even call this just run and generalize it beyond build scripts to executing some process.

Copy link
Contributor

@epage epage Jan 15, 2026

Choose a reason for hiding this comment

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

But not a blocker for this

} else {
self.build().join(pkg_dir)
}
Expand Down
16 changes: 8 additions & 8 deletions tests/testsuite/build_dir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,14 +292,14 @@ fn build_script_should_output_to_build_dir() {
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-build-script-build-script-build
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/build-script-build-script-build
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/build-script-build-script-build.json
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build_script_build[..].d
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build_script_build[..][EXE]
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build-script-build[EXE]
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/out/foo.txt
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/invoked.timestamp
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/output
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/root-output
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/stderr
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/build_script_build[..].d
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/build_script_build[..][EXE]
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/build-script-build[EXE]
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/out/foo.txt
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/invoked.timestamp
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/output
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/root-output
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/stderr
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/.lock
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/.lock
[ROOT]/foo/build-dir/debug/build/foo/[HASH]/.lock
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/clean_new_layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ fn build_script() {
.with_stderr_data(str![[r#"
[COMPILING] foo v0.0.1 ([ROOT]/foo)
[RUNNING] `rustc [..] build.rs [..]`
[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build`
[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/build-script-build`
[RUNNING] `rustc [..] src/main.rs [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s

Expand Down