Adapt llvm-has-rust-patches validation to take llvm-config into account.

TimNN · TimNN · commit 174a311591ba · 2024-02-10T22:33:56.000+01:00
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));
                 }

Original file line number	Diff line number	Diff line change
`@@ -1809,14 +1809,7 @@ impl Config {`
`1809`	`1809`	`}`
`1810`	`1810`	`target.llvm_config = Some(config.src.join(s));`
`1811`	`1811`	`}`
`1812`		`- if let Some(patches) = cfg.llvm_has_rust_patches {`
`1813`		`- assert_eq!(`
`1814`		`- config.submodules,`
`1815`		`- Some(false),`
`1816`		- "cannot set `llvm-has-rust-patches` for a managed submodule (set `build.submodules = false` if you want to apply patches)"
`1817`		`- );`
`1818`		`- target.llvm_has_rust_patches = Some(patches);`
`1819`		`- }`
	`1812`	`+ target.llvm_has_rust_patches = cfg.llvm_has_rust_patches;`
`1820`	`1813`	`if let Some(ref s) = cfg.llvm_filecheck {`
`1821`	`1814`	`target.llvm_filecheck = Some(config.src.join(s));`
`1822`	`1815`	`}`