has-rust-patches doesn't make sense to set for managed submodules

jyn514 · jyn514 · commit 7945458588a3 · 2022-11-24T19:27:05.000-05:00
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
@@ -1228,7 +1228,10 @@ impl Config {
                 if let Some(ref s) = cfg.llvm_config {
                     target.llvm_config = Some(config.src.join(s));
                 }
-                target.llvm_has_rust_patches = cfg.llvm_has_rust_patches;
+                if let Some(patches) = cfg.llvm_has_rust_patches {
+                    assert!(config.submodules.is_some(), "cannot set `llvm-hash-rust-patches` for a managed submodule");
+                    target.llvm_has_rust_patches = Some(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
`@@ -1228,7 +1228,10 @@ impl Config {`
`1228`	`1228`	`if let Some(ref s) = cfg.llvm_config {`
`1229`	`1229`	`target.llvm_config = Some(config.src.join(s));`
`1230`	`1230`	`}`
`1231`		`- target.llvm_has_rust_patches = cfg.llvm_has_rust_patches;`
	`1231`	`+ if let Some(patches) = cfg.llvm_has_rust_patches {`
	`1232`	+ assert!(config.submodules.is_some(), "cannot set `llvm-hash-rust-patches` for a managed submodule");
	`1233`	`+ target.llvm_has_rust_patches = Some(patches);`
	`1234`	`+ }`
`1232`	`1235`	`if let Some(ref s) = cfg.llvm_filecheck {`
`1233`	`1236`	`target.llvm_filecheck = Some(config.src.join(s));`
`1234`	`1237`	`}`