From 6e0e22080424e7d8a4b4638bf4fb41e691efb26b Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 26 Nov 2021 09:55:46 -0500 Subject: [PATCH] Fix bug where submodules wouldn't be updated when running x.py from a subdirectory 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`. --- src/bootstrap/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 3b3c8a9227d95..1667dfc3f8544 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -493,7 +493,7 @@ impl Build { // 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. - 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; }