diff options
| author | bors <bors@rust-lang.org> | 2021-11-27 00:42:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-27 00:42:30 +0000 |
| commit | bbad745a688c933a43d1bd977756bd6fc7f034f2 (patch) | |
| tree | 50ea2beb4ee1c2c4f01bc4a79f7f2766278fe134 /src/bootstrap | |
| parent | ccce98535bd51687554be8a209b3a529ef84f7e1 (diff) | |
| parent | 092477d8c994ae91dc73f90c086ba00e68674fa8 (diff) | |
Auto merge of #91269 - matthiaskrgr:rollup-jh8i8eh, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #90611 (Fix another ICE in rustdoc scrape_examples) - #91197 (rustdoc: Rename `Type::ResolvedPath` to `Type::Path` and don't re-export it) - #91223 (Fix headings indent) - #91240 (Saner formatting for UTF8_CHAR_WIDTH table) - #91248 (Bump compiler-builtins to 0.1.53) - #91252 (Fix bug where submodules wouldn't be updated when running x.py from a subdirectory) - #91259 (Remove `--display-doctest-warnings`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 3b3c8a9227d..1667dfc3f85 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; } |
