From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (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 1F2C015812D for ; Fri, 03 Jan 2025 17:54:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F680E082B; Fri, 03 Jan 2025 17:54:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22857E082B for ; Fri, 03 Jan 2025 17:54:49 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AED10335DC5 for ; Fri, 03 Jan 2025 17:54:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46B1B1148 for ; Fri, 03 Jan 2025 17:54:45 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1735926857.44d2dbd6db9e05f156a81a3a360ff48e2ac9d773.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 44d2dbd6db9e05f156a81a3a360ff48e2ac9d773 X-VCS-Branch: master Date: Fri, 03 Jan 2025 17:54: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: 64603e6f-6df8-488c-aca5-8188058883a2 X-Archives-Hash: 09f8cbbf5a11da27b5b35ed2f16c29f4 commit: 44d2dbd6db9e05f156a81a3a360ff48e2ac9d773 Author: James Le Cuirot gentoo org> AuthorDate: Thu Jan 2 16:25:10 2025 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Fri Jan 3 17:54:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d2dbd6 toolchain.eclass: Don't prefixify dynamic linker for cross-compilers Cross environments within a prefixed system do not have a nested prefix, i.e. they are located at ${EPREFIX}/usr/${CHOST}, not ${EPREFIX}/usr/${CHOST}/${EPREFIX}. Binaries built with the cross-compiler should therefore get an unprefixed dynamic linker path by default so that they work out of the box with QEMU's -L option. Signed-off-by: James Le Cuirot gentoo.org> eclass/toolchain.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 85b5a2b23392..d85994855704 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -721,7 +721,7 @@ toolchain_src_prepare() { gnuconfig_update - if ! use prefix-guest && [[ -n ${EPREFIX} ]] ; then + if ! is_crosscompile && ! use prefix-guest && [[ -n ${EPREFIX} ]] ; then einfo "Prefixifying dynamic linkers..." for f in gcc/config/*/*linux*.h ; do ebegin " Updating ${f}"