Adapt llvm-has-rust-patches validation to take llvm-config into a…

…ccount.
rust-lang · Feb 10, 2024 · 36bdb6b · 36bdb6b
1 parent 5f40394
commit 36bdb6b
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
@@ -1809,14 +1809,7 @@ impl Config {
                     }
                     target.llvm_config = Some(config.src.join(s));
                 }
-                if let Some(patches) = cfg.llvm_has_rust_patches {
-                    assert_eq!(
-                        config.submodules,
-                        Some(false),
-                        "cannot set `llvm-has-rust-patches` for a managed submodule (set `build.submodules = false` if you want to apply patches)"
-                    );
-                    target.llvm_has_rust_patches = Some(patches);
-                }
+                target.llvm_has_rust_patches = cfg.llvm_has_rust_patches;
                 if let Some(ref s) = cfg.llvm_filecheck {
                     target.llvm_filecheck = Some(config.src.join(s));
                 }