blob: d0e58d3592d583d2e286576a5e317f2be5e15998 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From a4671a2a90a8d2201876859e5ff54c1c94d1ebb3 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Wed, 10 Jan 2018 13:36:41 -0600
Subject: [PATCH 02/13] Fix linking to zlib when cross-compiling
---
compiler/rustc_llvm/build.rs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs
index 4302b1618331d..8cb72375c6598 100644
--- a/compiler/rustc_llvm/build.rs
+++ b/compiler/rustc_llvm/build.rs
@@ -237,10 +237,8 @@ fn main() {
// of llvm-config, not the target that we're attempting to link.
let mut cmd = Command::new(&llvm_config);
cmd.arg(llvm_link_arg).arg("--libs");
-
- if !is_crossed {
- cmd.arg("--system-libs");
- }
+ cmd.arg("--system-libs");
+ cmd.args(&components);
if (target.starts_with("arm") && !target.contains("freebsd"))
|| target.starts_with("mips-")
@@ -258,7 +256,6 @@ fn main() {
println!("cargo:rustc-link-lib=z");
println!("cargo:rustc-link-lib=execinfo");
}
- cmd.args(&components);
for lib in output(&mut cmd).split_whitespace() {
let name = if let Some(stripped) = lib.strip_prefix("-l") {
|
