Skip to content

Commit

Permalink
Rollup merge of rust-lang#87049 - jyn514:no-submodules, r=Mark-Simula…
Browse files Browse the repository at this point in the history
…crum

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

Fixes rust-lang#86954.

r? `@Mark-Simulacrum` cc `@durin42`
  • Loading branch information
Dylan-DPC committed Jul 11, 2021
2 parents a3d0d25 + 89d260f commit 37e34ee
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ pub(crate) fn update_llvm_submodule(build: &Build) {
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.
Expand Down

0 comments on commit 37e34ee

Please sign in to comment.