From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id 2PbKFRHgQmdMpgAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:13:05 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id 2PbKFRHgQmdMpgAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:13:05 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=U2Xkwa8n;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=caNlTXm7;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732435985; a=rsa-sha256; cv=none;
	b=pSfWVEcw1FhrWIxqqqp/jWpp2XXkZZoZaJvtgxzHxNKk8hZ8gglPZ7Xvi3IFyJ6JDg3XVi
	MhWif0FQoRj+04DhsNV3o/vYbFA65rFbJl++RSNqPhXGHM6ynm22a5OuETCdrKYXkOpf9i
	6VRuj8Q0aRCKnkvOylqmhkbXBJz2iu3rBYwgjJzDLb7FRkd4bJFCQ7eKGYK06HfRoUB9K3
	V7TP0gK8U3eYrfg+tFzQ6CpPAyPLBhcanvUUvSOgMAFCdh0w84B0HmqlKULUEDmVqW3AFo
	imS/BLC4PzA/c+M5ce5nB/uDRGWsWLmsuM0GBN37beaC9fCDmH5ilARHNDHuHg==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=U2Xkwa8n;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=caNlTXm7;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1732435985;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=o16PcGBBIDH33qhom8xsBinAoQX9bS+xb+wYH7j+BUc=;
	b=Ym8hOnOWjwmvMem8zpqJthbzouqfKcJGuC1WRlOJSFeOV47aFIjP74fvbnsirW7AUraufS
	hmN0uo2SyLRD8STd+dFuWIVMKexqWemTKVwahgyd+uMH05QdFtkSkqPZeAeU6P7rn6c6C7
	wLgmUDL55jh3mzqmB13RSNeJGWwC0tEIW5PQFRhp89e/nBigMkBz6G95fC6mZUBEzwBsFz
	JUTh23MTQaFsiVMi1l1HJeFcmI2QJHC2UwPpjm7Pq+e79CI8iZ6SguPqTSxKSj0PAiBbSA
	8ZXGLsu3P4dIHVjXeygrE+TqJ7ww+37XkmlXXLTxh0pySNm/Y5dmFJLTTtsicA==
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 3C0EC4716
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:13:03 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tF7Ug-0000NE-CL; Sun, 24 Nov 2024 02:57:22 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Uc-0000Hs-M3
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:18 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7UY-0002LV-R0; Sun, 24 Nov 2024 02:57:18 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:References:In-Reply-To:Date:From:To:Subject;
 bh=o16PcGBBIDH33qhom8xsBinAoQX9bS+xb+wYH7j+BUc=; 
 b=U2Xkwa8nXQ1/VhIoUuBCPtoCaR0sPXKkXwqPC6lrc1GSjlLkyrWaLP3PnOsSSAZndsh6iMk3h3F9ExJwD6n3cXGFcB0RmChj8ZnoM38XqlsJvGeKxxXDSOwyLCeUwvMLgWiPn1+gne4WHnzeXlT8+tIwjp4O8WSAlfFY9Vh3yJ8MshzEtMW1zv4vm6qvmI9nl4oYHN898cSakSzskAkF0hfr8DTz+CZvEbqr8drfo7d8NJYvlG+MbHGToUFFO4YbEhINC7/+nCAKlZ4KVrWaHF/yrMhMLjKrbQ1g9f8lzUuYXhUyoNtVDGkt9vLjLa6akv1S6G1DzyJfeCL8MPJ/fA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7UY-0004iY-IU; Sun, 24 Nov 2024 02:57:14 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 25/58] gnu: gcc-14: Force libdir /lib instead
 of /lib64 for the 64bit Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:57:14 +0000
Resent-Message-ID: <handler.74290.B74290.173243500817789@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 74290
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74290@debbugs.gnu.org
Cc: Andreas Enge <andreas@enge.fr>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
X-Debbugs-Original-Xcc: Andreas Enge <andreas@enge.fr>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500817789
 (code B ref 74290); Sun, 24 Nov 2024 07:57:14 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:48 +0000
Received: from localhost ([127.0.0.1]:60765 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7U7-0004cl-US
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:48 -0500
Received: from eggs.gnu.org ([209.51.188.92]:60346)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7Ti-0004Yd-Mv
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:22 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <janneke@gnu.org>)
 id 1tF7Td-00028N-GI; Sun, 24 Nov 2024 02:56:17 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
 From; bh=o16PcGBBIDH33qhom8xsBinAoQX9bS+xb+wYH7j+BUc=; b=caNlTXm7tST3cvu++t1t
 YdfYVAozU+nSqfFepcZML/Kfev9R2S2lEPudLu0nHGKTyIXjlue4q7NKPhEO7YCWS7ThPQWna6Lq+
 oI9oUgtNjPO+dT3TDiMDH01OftqKgbhl75KKwEKqWPZ0Ogc7GuF0wr7K52OVlpQfqUsytHCJsAGtl
 j1DjqNx5ko3HSWBSa3D8hj78dO/eHPCJCgpqlkAHgNr19Q7+sJGIPpp/4ZiTmy5I2Y0SZLcBli9nG
 rOsKuVoZCiw84JFuCbToj544+BM4fwpnl8heqRR1iqQRfvxsCuNEK1i/okBuFd9ncYyTROhKnVQZC
 CfYrQQP8j2knLA==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:54:48 +0100
Message-ID: <07b8a9d99607011e815e015d92aa161aebe4b722.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: -1.83
X-Spam-Score: -1.83
X-Migadu-Queue-Id: 3C0EC4716
X-Migadu-Scanner: mx12.migadu.com
X-TUID: uh1k6xjdqJvC

* gnu/packages/gcc.scm (gcc-14)[arguments]: In stage "pre-x86-configure", also
patch "gcc/config/i386/t-gnu64".

Change-Id: Ib2607c5f315c49696596fdcbcbbcc2895b6a9775
---
 gnu/packages/gcc.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 64ba37fd69..e437bf5826 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -843,7 +843,8 @@ (define-public gcc-14
                   #~(modify-phases #$phases
                       (add-before 'configure 'pre-x86-configure
                         (lambda _
-                          (substitute* "gcc/config/i386/t-linux64"
+                          (substitute* '("gcc/config/i386/t-linux64"
+                                         "gcc/config/i386/t-gnu64")
                             (("\\.\\./lib64") "../lib"))))))))
     (properties
      `((compiler-cpu-architectures
-- 
2.46.0