From 29e11a1231ed159572aa4e6c64fd9cdac97f7c03 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 30 Jul 2024 09:27:55 -0500 Subject: bootstrap/rust-1.{61-79}: New package --- ...-Fix-linking-to-zlib-when-cross-compiling.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 bootstrap/rust-1.64/0002-Fix-linking-to-zlib-when-cross-compiling.patch (limited to 'bootstrap/rust-1.64/0002-Fix-linking-to-zlib-when-cross-compiling.patch') diff --git a/bootstrap/rust-1.64/0002-Fix-linking-to-zlib-when-cross-compiling.patch b/bootstrap/rust-1.64/0002-Fix-linking-to-zlib-when-cross-compiling.patch new file mode 100644 index 000000000..458b89516 --- /dev/null +++ b/bootstrap/rust-1.64/0002-Fix-linking-to-zlib-when-cross-compiling.patch @@ -0,0 +1,36 @@ +From 702ebc6e2283f69e8b024b2cf12899a2bbdf6e8b Mon Sep 17 00:00:00 2001 +From: Samuel Holland +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 3b6808d693f..4713f550a73 100644 +--- a/compiler/rustc_llvm/build.rs ++++ b/compiler/rustc_llvm/build.rs +@@ -234,16 +234,15 @@ 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") { + println!("cargo:rustc-link-lib=z"); + } +- cmd.args(&components); + + for lib in output(&mut cmd).split_whitespace() { + let name = if let Some(stripped) = lib.strip_prefix("-l") { +-- +2.35.1 + -- cgit v1.2.3-70-g09d2