fix llvm_out to find the correct LLVM root

onur-ozkan · onur-ozkan · commit d780721c1044 · 2024-02-06T23:39:54.000+03:00
When `download-ci-llvm` is enabled, llvm_out ends up with the error below
due to an incorrect path on cross-compilations. This change fixes that.

failed to execute command: "/rust/build/x86_64-unknown-linux-gnu/llvm/build/bin/llvm-config" "--version"
ERROR: No such file or directory (os error 2)

Signed-off-by: onur-ozkan &lt;work@onurozkan.dev&gt;
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
@@ -801,7 +801,8 @@ impl Build {
     /// Note that if LLVM is configured externally then the directory returned
     /// will likely be empty.
     fn llvm_out(&self, target: TargetSelection) -> PathBuf {
-        self.out.join(&*target.triple).join("llvm")
+        let dir = if self.config.llvm_from_ci { "ci-llvm" } else { "llvm" };
+        self.out.join(&*target.triple).join(dir)
     }
 
     fn lld_out(&self, target: TargetSelection) -> PathBuf {

Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,8 @@ impl Build {`
`801`	`801`	`/// Note that if LLVM is configured externally then the directory returned`
`802`	`802`	`/// will likely be empty.`
`803`	`803`	`fn llvm_out(&self, target: TargetSelection) -> PathBuf {`
`804`		`- self.out.join(&*target.triple).join("llvm")`
	`804`	`+ let dir = if self.config.llvm_from_ci { "ci-llvm" } else { "llvm" };`
	`805`	`+ self.out.join(&*target.triple).join(dir)`
`805`	`806`	`}`
`806`	`807`
`807`	`808`	`fn lld_out(&self, target: TargetSelection) -> PathBuf {`