fix llvm ThinLTO behaviour

onur-ozkan · onur-ozkan · commit 018ed9abb924 · 2024-09-08T17:52:14.000+03:00
Signed-off-by: onur-ozkan &lt;work@onurozkan.dev&gt;
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
@@ -1916,8 +1916,7 @@ impl Config {
                 }
             }
 
-            // NOTE: can never be hit when downloading from CI, since we call `check_ci_llvm!(thin_lto)` above.
-            if config.llvm_thin_lto && link_shared.is_none() {
+            if !config.llvm_from_ci && config.llvm_thin_lto && link_shared.is_none() {
                 // If we're building with ThinLTO on, by default we want to link
                 // to LLVM shared, to avoid re-doing ThinLTO (which happens in
                 // the link step) with each stage.

Original file line number	Diff line number	Diff line change
`@@ -1916,8 +1916,7 @@ impl Config {`
`1916`	`1916`	`}`
`1917`	`1917`	`}`
`1918`	`1918`
`1919`		- // NOTE: can never be hit when downloading from CI, since we call `check_ci_llvm!(thin_lto)` above.
`1920`		`- if config.llvm_thin_lto && link_shared.is_none() {`
	`1919`	`+ if !config.llvm_from_ci && config.llvm_thin_lto && link_shared.is_none() {`
`1921`	`1920`	`// If we're building with ThinLTO on, by default we want to link`
`1922`	`1921`	`// to LLVM shared, to avoid re-doing ThinLTO (which happens in`
`1923`	`1922`	`// the link step) with each stage.`