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

Rollup of 4 pull requests #130424

Closed
wants to merge 8 commits into from
Closed

Rollup of 4 pull requests #130424

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56fb89a
Document futility of printing temporary pointers
kornelski Jul 17, 2024
d9e560c
simplify `Build::update_existing_submodule`
onur-ozkan Sep 14, 2024
7223fd8
Add system libs when cross compiling for Windows
ChrisDenton Sep 15, 2024
b53f5ce
Don't ICE when RPITIT captures more method args than trait definition
compiler-errors Sep 15, 2024
ac3d32b
Rollup merge of #127879 - kornelski:bad-pointer-printf, r=workingjubilee
matthiaskrgr Sep 16, 2024
7210d40
Rollup merge of #130336 - onur-ozkan:simple-improvement, r=albertlars…
matthiaskrgr Sep 16, 2024
720c753
Rollup merge of #130398 - ChrisDenton:win-cross, r=jieyouxu
matthiaskrgr Sep 16, 2024
2c27dcf
Rollup merge of #130412 - compiler-errors:rpitit-overcapture, r=jieyouxu
matthiaskrgr Sep 16, 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
6 changes: 1 addition & 5 deletions src/bootstrap/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,11 +552,7 @@ impl Build {
// Look for `submodule.$name.path = $path`
// Sample output: `submodule.src/rust-installer.path src/tools/rust-installer`
let submodule = line.split_once(' ').unwrap().1;
let path = Path::new(submodule);
// Don't update the submodule unless it's already been cloned.
if GitInfo::new(false, path).is_managed_git_subrepository() {
self.config.update_submodule(submodule);
}
self.update_existing_submodule(submodule);
}
}

Expand Down