From 174a311591ba3c68f9b808de564a4af56acd3a16 Mon Sep 17 00:00:00 2001 From: Tim Neumann Date: Sat, 10 Feb 2024 20:20:16 +0100 Subject: [PATCH] Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account. --- src/bootstrap/src/core/config/config.rs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index c0dd1e1208484..b726c129b099b 100644 --- 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)); }