blob: e99155e783fb5fc52e617d278f200a43d651af41 (
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
35
|
From d5caf4a4c7cfee3a53892b6ad90603ae86321baa 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/14] Fix linking to zlib when cross-compiling
---
compiler/rustc_llvm/build.rs | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs
index 28e092c1eb72c..00e5cff65d851 100644
--- a/compiler/rustc_llvm/build.rs
+++ b/compiler/rustc_llvm/build.rs
@@ -234,10 +234,10 @@ 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");
+ cmd.arg("--system-libs");
+ cmd.args(&components);
- if !is_crossed {
- cmd.arg("--system-libs");
- } else if target.contains("windows-gnu") {
+ if target.contains("windows-gnu") {
println!("cargo:rustc-link-lib=shell32");
println!("cargo:rustc-link-lib=uuid");
} else if target.contains("netbsd") || target.contains("haiku") || target.contains("darwin") {
@@ -250,7 +250,6 @@ fn main() {
// 32-bit targets need to link libatomic.
println!("cargo:rustc-link-lib=atomic");
}
- cmd.args(&components);
for lib in output(&mut cmd).split_whitespace() {
let name = if let Some(stripped) = lib.strip_prefix("-l") {
|
