From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 43D8D15808A for ; Tue, 29 Jul 2025 03:42:51 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2D9DE341EA6 for ; Tue, 29 Jul 2025 03:42:51 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 51B0411055E; Tue, 29 Jul 2025 03:42:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 4884011055E for ; Tue, 29 Jul 2025 03:42:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF62834120D for ; Tue, 29 Jul 2025 03:42:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90E6532B4 for ; Tue, 29 Jul 2025 03:42:45 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1753760378.24b40048ccc4ba16a0f3570e6957398fff434f9f.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:master commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.85.0-cross-compile-libz.patch 1.89.0-compiler-link-with-system-libs-unconditionally.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 24b40048ccc4ba16a0f3570e6957398fff434f9f X-VCS-Branch: master Date: Tue, 29 Jul 2025 03:42:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cf14d5ab-8ef4-4d2a-993a-0bd6a8befee5 X-Archives-Hash: b91007fdbefee8154512c3ef1d4178b6 Message-ID: <20250729034245.bog4CZyfhuZAH8AVCWGL07CZXKw078YH2fmlCdc--30@z> commit: 24b40048ccc4ba16a0f3570e6957398fff434f9f Author: Matt Jolly gentoo org> AuthorDate: Tue Jul 29 03:25:05 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jul 29 03:39:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=24b40048 Update system-libs patch for 1.89.0 We'll be a bit more descriptive with the patch name from now on. Signed-off-by: Matt Jolly gentoo.org> ...piler-link-with-system-libs-unconditionally.patch | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/1.85.0-cross-compile-libz.patch b/1.89.0-compiler-link-with-system-libs-unconditionally.patch similarity index 66% rename from 1.85.0-cross-compile-libz.patch rename to 1.89.0-compiler-link-with-system-libs-unconditionally.patch index 7bd45c4..7c4c0c2 100644 --- a/1.85.0-cross-compile-libz.patch +++ b/1.89.0-compiler-link-with-system-libs-unconditionally.patch @@ -1,26 +1,28 @@ -From 768f7e50a6d9a3db4e4eef45dcb4c56e9b580389 Mon Sep 17 00:00:00 2001 +From be4a936e252efb821ad30a30b59ba4ef1450097a Mon Sep 17 00:00:00 2001 From: Matt Jolly -Date: Sun, 9 Feb 2025 21:12:43 +1000 -Subject: [PATCH] Update libz cross-compile patch for 9999 (1.86.0) +Date: Tue, 29 Jul 2025 13:05:54 +1000 +Subject: [PATCH 1/2] compiler: link with system libs unconditionally See-also: https://paste.sr.ht/~kchibisov/682321e0fd4a3ece4a4b7b71591896f5cd3cdb22 See-also: https://github.com/gentoo/gentoo/pull/35246#discussion_r1484525497 +Signed-off-by: Matt Jolly --- a/compiler/rustc_llvm/build.rs +++ b/compiler/rustc_llvm/build.rs -@@ -219,13 +219,7 @@ fn main() { - // of llvm-config, not the target that we're attempting to link. +@@ -228,12 +228,8 @@ fn main() { let mut cmd = Command::new(&llvm_config); cmd.arg(llvm_link_arg).arg("--libs"); -- -- // Don't link system libs if cross-compiling unless targeting Windows. + +- // Don't link system libs if cross-compiling unless targeting Windows from Windows host. - // On Windows system DLLs aren't linked directly, instead import libraries are used. - // These import libraries are independent of the host. -- if !is_crossed || target.contains("windows") { +- if !is_crossed || target.contains("windows") && host.contains("windows") { - cmd.arg("--system-libs"); - } ++ // Link against system libs + cmd.arg("--system-libs"); // We need libkstat for getHostCPUName on SPARC builds. // See also: https://github.com/llvm/llvm-project/issues/64186 -- -2.48.0 +2.50.1 +