Rollup merge of #87049 - jyn514:no-submodules, r=Mark-Simulacrum

Account for `submodules = false` in config.toml when updating LLVM submodule

Fixes https://github.com/rust-lang/rust/issues/86954.

r? ``@Mark-Simulacrum`` cc ``@durin42``
This commit is contained in:
Yuki Okushi 2021-07-12 04:32:04 +09:00 committed by GitHub
commit f3d5fde070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -99,6 +99,10 @@ fn dir_is_empty(dir: &Path) -> bool {
t!(std::fs::read_dir(dir)).next().is_none()
}
if !build.config.submodules {
return;
}
// NOTE: The check for the empty directory is here because when running x.py
// the first time, the llvm submodule won't be checked out. Check it out
// now so we can build it.