2cab55965b
Also remove option static_llvm and add option bindist, which helps simplify building bootstrap tarballs.
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From 07efbc3bdd67de4e13b0f3f4df853a9de0800ec3 Mon Sep 17 00:00:00 2001
|
|
From: q66 <daniel@octaforge.org>
|
|
Date: Sun, 3 May 2020 18:05:22 +0200
|
|
Subject: [PATCH 14/15] Void: fix linkage against host/target LLVM in cross
|
|
setups
|
|
|
|
---
|
|
src/librustc_llvm/build.rs | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
|
|
index 9b4f03b3..d0167838 100644
|
|
--- a/src/librustc_llvm/build.rs
|
|
+++ b/src/librustc_llvm/build.rs
|
|
@@ -217,9 +217,11 @@ fn main() {
|
|
for lib in output(&mut cmd).split_whitespace() {
|
|
if is_crossed {
|
|
if lib.starts_with("-LIBPATH:") {
|
|
- println!("cargo:rustc-link-search=native={}", lib[9..].replace(&host, &target));
|
|
+ println!("cargo:rustc-link-search=native={}{}",
|
|
+ env::var("XBPS_CROSS_BASE").unwrap(), &lib[9..]);
|
|
} else if lib.starts_with("-L") {
|
|
- println!("cargo:rustc-link-search=native={}", lib[2..].replace(&host, &target));
|
|
+ println!("cargo:rustc-link-search=native={}{}",
|
|
+ env::var("XBPS_CROSS_BASE").unwrap(), &lib[2..]);
|
|
}
|
|
} else if lib.starts_with("-LIBPATH:") {
|
|
println!("cargo:rustc-link-search=native={}", &lib[9..]);
|
|
--
|
|
2.26.2
|
|
|