about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-07-12 04:32:04 +0900
committerGitHub <noreply@github.com>2021-07-12 04:32:04 +0900
commitf3d5fde0702dbcfbb97a6a3145eda8a3c5ff4d5f (patch)
treeed508ea3862710af5bfa83f7fc67e0b76cdbfe29 /src
parent76aebb195b305c73cb9bc6e8e1964a28201a6c0c (diff)
parent89d260f86eacde2a44e3af02a99b0bdf3ffea35a (diff)
downloadrust-f3d5fde0702dbcfbb97a6a3145eda8a3c5ff4d5f.tar.gz
rust-f3d5fde0702dbcfbb97a6a3145eda8a3c5ff4d5f.zip
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``
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/native.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index b967b6dbd2d..0be42d9b234 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -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.