bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix bug where submodules wouldn't be updated when running x.py from a subdirectory

Browse source 
Previously, it would concatenate the relative path to the current
subdirectory, which looked at the wrong folder.

I tested this by checking out `1.56.1`, changing the current directory
to `src/`, and running `../x.py build`.
This commit is contained in:
Joshua Nelson 2021-11-26 09:55:46 -05:00
parent 1e79d79dac
commit 6e0e220804
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/lib.rs
View file

@ -493,7 +493,7 @@ impl Build {
// NOTE: The check for the empty directory is here because when running x.py the first time, // NOTE: The check for the empty directory is here because when running x.py the first time,
// the submodule won't be checked out. Check it out now so we can build it. // the submodule won't be checked out. Check it out now so we can build it.
if !channel::GitInfo::new(false, relative_path).is_git() && !dir_is_empty(&absolute_path) { if !channel::GitInfo::new(false, &absolute_path).is_git() && !dir_is_empty(&absolute_path) {
return; return;
} }