Skip to content
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

Fix missing submodule in ./x vendor #133215

Merged
merged 2 commits into from
Nov 23, 2024
Merged

Fix missing submodule in ./x vendor #133215

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16550d9
Fix missing submodule in `./x vendor`
ehuss Nov 19, 2024
d8e8fc5
Keep list of submodules close to list of vendored workspaces
ehuss Nov 21, 2024
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
Next Next commit
Fix missing submodule in ./x vendor 
The `src/tools/rustc-perf` submodule is needed for vendoring because
it is included in the vendor set.
  • Loading branch information
@ehuss
ehuss committed Nov 19, 2024
commit 16550d9e67e4845212879d56ab7e300d7911de24
4 changes: 3 additions & 1 deletion src/bootstrap/src/core/build_steps/vendor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ impl Step for Vendor {
}

// These submodules must be present for `x vendor` to work.
for submodule in SUBMODULES_FOR_RUSTBOOK.iter().chain(["src/tools/cargo"].iter()) {
for submodule in
Kobzol marked this conversation as resolved.
Show resolved Hide resolved
SUBMODULES_FOR_RUSTBOOK.iter().chain(["src/tools/cargo", "src/tools/rustc-perf"].iter())
{
builder.build.require_submodule(submodule, None);
}

Expand Down
Loading