From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +JnRI2mjjmKvrAAAbAwnHQ (envelope-from ) for ; Wed, 25 May 2022 23:45:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cACUI2mjjmL6QAEAauVa8A (envelope-from ) for ; Wed, 25 May 2022 23:45:13 +0200 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 173EE1DE21 for ; Wed, 25 May 2022 23:45:13 +0200 (CEST) Received: from localhost ([::1]:56608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntyoX-0004S0-NZ for larch@yhetil.org; Wed, 25 May 2022 17:45:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntyoQ-0004R5-CA for guix-patches@gnu.org; Wed, 25 May 2022 17:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ntyoQ-0007BS-17 for guix-patches@gnu.org; Wed, 25 May 2022 17:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ntyoP-0006pi-Uu for guix-patches@gnu.org; Wed, 25 May 2022 17:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55643] [PATCH] gnu: GCC: Add cross environment variables patch to GCC 12. Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 May 2022 21:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55643@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165351504426155 (code B ref -1); Wed, 25 May 2022 21:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 May 2022 21:44:04 +0000 Received: from localhost ([127.0.0.1]:56550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntynQ-0006nK-Vw for submit@debbugs.gnu.org; Wed, 25 May 2022 17:44:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:33828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntynM-0006n7-Kw for submit@debbugs.gnu.org; Wed, 25 May 2022 17:44:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntynM-00031Q-6G for guix-patches@gnu.org; Wed, 25 May 2022 17:43:56 -0400 Received: from mail-mw2nam10olkn20821.outbound.protection.outlook.com ([2a01:111:f400:7e89::821]:48385 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntynJ-00076s-FS for guix-patches@gnu.org; Wed, 25 May 2022 17:43:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kgJJg4oomnS7a3hW+MJvFfbGiMHLrvaMnX+yLlJkr8fH62b6ESy+XXeBowcxrk9p1EH2Mu8vcOGcD4EC2wqswHuxyBdsb/+gACNjahero8lmX9pj2AOPfQfN4yotsbyYJ8zvrn0iQVFr+bj4cxHkweazNOq7ggPopSTbXU62glTodzr4fvsNlHUvJmWISKLxEGsvmNjEjoOx9u65tB4UpY4oPc23mDRd+d1PjhdExyJeMNc6Bp6kxje9Kc65rlohM8ViDlJywHaP4Od2calv7MJ42c5fM4r6//iTEm6g/NQ9xm1vfWVru+FDxpkdTvX2s/ah9HX/JHEAWV2JIfo+iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pkM/npJEQ6/PYgc0APscZaCRaqPwLjKeUaXMG3u59/k=; b=RXSpU8a8HoYT8qNb0L8660v/1Bbc5O7pJINXuCFQlZxseuDd34PFMetRSVQscLNUkSmg2UHTHNkCV02b7Og2yW4mrshKxkZr/+yT2exHfmck8QVpl8CEMS3wkj2VOi6Ca9vwOM+LR0S0opcBIUspK9dGAH5d8cYyIpUk7QVDU4PR9836BpY2yWWiNg5XIHGd7ft7iscJHLAsH+fOO+/kiB7DS46ZIaGXRG7KY3QnlmfORasH+tGJQXb4nuhUOP+b4zTGpme0fkRhi9CcmCYiv2QFlu3ExDt5fjk8QMQ1U7ybyHlkV9YzQnyfPD9Pqy1kLunvf5Q13TC/XduFkBiutg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pkM/npJEQ6/PYgc0APscZaCRaqPwLjKeUaXMG3u59/k=; b=DEkodarzSiEI5qcJAGje5LHKbz7ZdbNrSIzUC49XPFk1dvbH2OuMnkXPhcjtoPl2F7MJnSw5MV7REIi2cWTrNFq2U4emAGVam6j3Ttawsyg24t+b1NG1ygjj9qqdM8GU1PfbblpirEHj7Kf5JH3HoGy+HNW4ai0ejSoMNEVcYttkWSjnEsTd31Fge6lVG8kV5nqDBFYcSi8zqQKcIQ4yFAPwpziuI+oXNURUdBQk2wlVUR4Rr5Ys6i8dEADwxVvoYZy1jnrZHBY40uhS0qLAZNYREeO6DijCGdGYrbaPsGu4/oWxPZnKEU/pGaIHRWmNSilqwRlgGQRL3UFEVn02cQ== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by CY4PR03MB3189.namprd03.prod.outlook.com (2603:10b6:910:50::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Wed, 25 May 2022 21:38:47 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::a0ba:5643:dda0:2e64]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::a0ba:5643:dda0:2e64%4]) with mapi id 15.20.5273.014; Wed, 25 May 2022 21:38:47 +0000 From: Morgan.J.Smith@outlook.com Date: Wed, 25 May 2022 17:37:32 -0400 Message-ID: X-Mailer: git-send-email 2.36.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [BdRKfb2szt2d//dZk4RE45LUXRUgvgLH] X-ClientProxiedBy: YQBPR01CA0087.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::23) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <20220525213731.16205-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07be4392-e517-4e58-a5a2-08da3e96f2cc X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEumrs2FBXeSPC9NMslLJDm6NJ4dvURVStbSKF+/gzVINkDZot+wVtw5C5ELIjQvluiz4cLNU2nLGneY7t7Q4xxWTUKEyu0+88TfUO/d3ti6Mzk7z53O9NY35VFKLjoYJcrAJvqcceP6FMxsco93R0lIayP/3h3Dth7JBPbUOF8t2XInt2O1zCeqnrAXNPSPAhqBrNHwG0YtVSI0NZbnPB/uA5H5kUzztqwne3ff9TmxoHlcFjX5qs9HGUAgLJUpKFLmRWGRHwbcjtgsFEOYlljbNxUgQMq/ClAEKON0+r9EsNcvvROQUNL8Pje204GJHuQMALGx9BtSGjCuO3UJDmfMuLqxcEdpttBorKv00oo4VQxUfMYUbUwUO4ee8smssKUGjHi5b9AyZcnimW1CG1kDaOt25drHIb2UggxHR31qlsShXTFyB8eSUaO/ZjIXpjlY+9QYBX+ROwshvoEJiADK5FFVILDhnx+u8EZe9sOAQtH4uglJL5UHk1ZQIXXANE5IFj8ZOIXf5XGGtLBweCeuelbb1dcrWzQ0TXPDZyNmr5C6xSLDO5X+v3J+fgtcsl5gSR9AQLxH6d2S+ye2HK5+LLq2i08QV/aEsZJFY97vsnGZDyWZ2tm909zIi1rcpH9BTDzXyisyq8aZ/r9RxmXDj9rhbB7wTgDvgDBBLCNRQSyUBa8tugdj91Vb3fmxKeWha0hdsVTkoGvu/li1o9NFlnFbcC8bVua54P+EH8iFGUJzNvU2Q3AHPqe9TiQLFdglByt/HgKGzylqILvHZFlc X-MS-TrafficTypeDiagnostic: CY4PR03MB3189:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mxM1TrtrpOIwLt0YVGgC2gaPERx1zkCz38zwMxddS55fQYI4AaR9SAcKqxyL/c0FBkKPwC3W2u6sUrpeAbKTvnR/u309T3uE0vskX9Lpt3cZKwz9XpkYoI9jMzn8VP9hv0PUuB6460NH/daNO4oRp7RfgajUzA8vO3LV5IqiCARJYXAvpFIMjqE+kxnNrkvj52AVHFi+FUrCpJiraxm7x6QSGd8wq6Lv7MRJOo3k3fSj+Kz2TOdaomjW6iU1gblGJYfz4b6RZ/pzV0YGVd8hR0I3W2/mxg+uyQ6pReg+0t1xUgE70dec9r0nruHqC4ap/cOcJtpjdM1F3xmoMD5Nb39AOLM5CjaF2SYOsIdDpSGeiE4lZXJx4l6qRn6G0bjve8M3xUl/sxwTlasEQglzyvQ/081eLBliw7Vz4VAtjRmN7QOMqGmpEzGz44cX2khnD6r5qUHRIiQzlj0BJz2VdJbRvOWYe71hKN6bc6uW46MH0d2svkpyM6I9j0Hdygk2AcqTXKvnl9vPhMHbb7hw3RqsqFv/1O7pDaWYPLRFTZ7UCDwr3Ow/N9tQqVJsiMmWDvrkGKvD6brqjZAGRxhlimJC61nlPO0B7c19BO/3TuWGKWQYDReRddbZ4YqWTM98 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ilKKBtSs/m7DOcDjJP+ZhynNTjjU7nRQtUmk6ZgYzK5F+5u6m6QpJcKsdk4FOHk6mCOpXLCaz6RJN3+68nSE9C5auaHxPPXTqyEP8oDUb86aI84lOm3YQDf9iXPcHbeaKrAYMbrQhAaOfZOagp5oEIoQMIRJHJH/M2RETmKRXKrbQri4gvEfxB4hftA9Zj1TgmTFWnkZm+AhxzQL5rlJYSSs7WJ+EttST1/SezTJsme0OOulOCRozAYd0GuyEcGHNNJz8/bC9yWWoUb38tWDLrhkGBcndGZEDOqmOOHjHw4cYHpJq3D9DwjARjh8Wwgpm+HrWDPyY/TNkJOwRE/DA/w0bCvG/Lpy89KAdzXRFJvg8cC+7dULEk6K12laiJ4ahCTrNN6f4gyanSUMdRBa7/GWzopMEr9o7TnePpR56M3/h55RSw31DbOqZKAjICBKOxWoQxCCFU3t1I9zhzXkTu099VNw9X2Aat0mW+Nj2llAO0TguEJr7tUJwb1TpBdi2pkhBGHqp4RcyJGYgH5HD76iFoC+FAgwQ0jg0lZVA/DvirzaN4XCzGmAJRBTV0o/NOrIgzKnafdpdiYxzzGM2MYY5LSoLip7Ti+lRjFZrkRE7Qy2KWLWroaX9ZXEJ79cHw8J+dACvKvZaDZt1HbGBcWOTwzDkRKBfUbbwbaslI7shlXkOK9ZFgR4wcibviNVfK+X/Nti8MSYy7CQDAr5WMNkFx9Pnj2sXkdtFTy1BFEMS8cODVqNOvxwFSomPGJXAFAEgR0OhRYAwHlFFYjQtpupcpTRpcgO+quF50rxipoTwN74Bl7ctDISm9dB4yt1V6e3T3zp8Nhk7qdSQmHxGMlP99ieeyuZoFeLeM9duIDc8BwQv0oXO+w4G+NuSMFzjlrA412sqmlYINMHlu0SKnCddnroDQrP2WXTegixMK03tquqyBxs5YkmGjSJdand Lbci1HlOSMvk/9KivW1EjJ2xnW2kv7TgUJMnmYkGfBGt9dP0hnVlBb5LMNYFYcWZcOpfwR17fl23y/IY69z49FH2YjST8/U3T5CIrAhzxIIeZ3MfRcnW2RHdcdR2wB0Zj80oPrNFNInbSYXVmWG5oJKCGydTwqEPQX5q/dIy65kPII4VBpyi46YGITreqdhSzMzZvsutlVEy4Q5RgR3WTmCt6nleGcri8Dfr0LfBnc+XqkDxVypC+x8Ne7DBsCDOzwUUzoZy6y45luVjvMShspPQT7IlpbMMISkA9am2R0kPS8KMLH+eC3/KN3EDvOnAZEGoRmU0cwSQDrT2gd2yqdQV5hiDtHXY/xqcqTRlILQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07be4392-e517-4e58-a5a2-08da3e96f2cc X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 21:38:46.9767 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB3189 Received-SPF: pass client-ip=2a01:111:f400:7e89::821; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653515113; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=pkM/npJEQ6/PYgc0APscZaCRaqPwLjKeUaXMG3u59/k=; b=WsJ5Dfy6ozcBEikjpUADF94ysiQLIdFBQQuheCj5kI+45OO0qjbxEiMndQ2MWtPaR5znr2 XDrfymOBAmZkJ9xQlPU8S4Vy/+cAGz0kyV/CtebRTHjt0Xeb98wPtr9wOGx+3mwpA5huOO RgFGAykxiUdtubYy6G5ypx/18tk/gHkKio4JUly21lJmv/JlcLnxU5RfYe4CaJozrn1M7r WCqnOocksL4aHdoIfVRybfvC2leQ++kB5cbqCDqgfcR+79cs8/HE8yCPj04BU0VhTGLwdo lTFuQZznmjQmFfyzdZ7y5OxGwbdjem2L1PYLg/OToTgX6tLPp01W1ljR5jPatQ== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1653515113; a=rsa-sha256; cv=fail; b=lNtUkXUcSm7K5nuGH6pWMTP3D6wJzke/ZYf6hz14clUmL1NPAP41q/C7g+Wdp2F5259b2a HkbaHBTiRpBvbg+CGF4yLVDr0i0p/f4hTJx4pNKQabEvo09wpE3DBmKOKHzufzmRFNS+/J vfqUkta+YaKLbD321+rBahxol8k4agoLq+GlrSYEnlTW4UR3P3T4SPInUEYm1SyYDuQ9YT 1XE7KOIoNxRVtlvy9ixaA12VabQY9ZGS+GquoQTFSlw5g/Wk1CKApi8G0yfpCFgrQvmEOu f73UeUIr7oTDWVAJw2TgXL4+i+5hbE39++yPRDwyJBOZhEi42qH0O8yf0ho3ZA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=DEkodarz; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); 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" X-Migadu-Spam-Score: 5.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=DEkodarz; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); 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" X-Migadu-Queue-Id: 173EE1DE21 X-Spam-Score: 5.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: YXUDpU0lYUsO From: Morgan Smith * gnu/packages/patches/gcc-12-cross-environment-variables.patch : New file. * gnu/local.mk (dist_patch_DATA): Add gcc-12-cross-environment-variables.patch. * gnu/packages/cross-base.scm (cross-gcc)[source](patches): Apply the patch. --- The files names have changed (gcc.c -> gcc.cc) so we can't keep using the gcc 10 patch. Tested and working for me gnu/local.mk | 1 + gnu/packages/cross-base.scm | 3 ++ .../gcc-12-cross-environment-variables.patch | 54 +++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 gnu/packages/patches/gcc-12-cross-environment-variables.patch diff --git a/gnu/local.mk b/gnu/local.mk index a4250248ca..0bc45fd26e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1130,6 +1130,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gcc-12-strmov-store-file-names.patch \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \ + %D%/packages/patches/gcc-12-cross-environment-variables.patch \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 93e4f8a445..9c98c923ff 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -242,6 +242,9 @@ (define* (cross-gcc target (append (origin-patches (package-source xgcc)) (append (cond + ((version>=? (package-version xgcc) "12.0") + (search-patches "gcc-12-cross-environment-variables.patch" + "gcc-cross-gxx-include-dir.patch")) ((version>=? (package-version xgcc) "10.0") (search-patches "gcc-10-cross-environment-variables.patch" "gcc-cross-gxx-include-dir.patch")) diff --git a/gnu/packages/patches/gcc-12-cross-environment-variables.patch b/gnu/packages/patches/gcc-12-cross-environment-variables.patch new file mode 100644 index 0000000000..8787f094c0 --- /dev/null +++ b/gnu/packages/patches/gcc-12-cross-environment-variables.patch @@ -0,0 +1,54 @@ +Search path environment variables for cross-compilers. See the discussion +at . + +Note: Touch 'C_INCLUDE_PATH' et al. rather than 'CPATH', as discussed +at . + +diff --git a/gcc/gcc.cc b/gcc/gcc.cc +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -4832,7 +4832,7 @@ process_command (unsigned int decoded_options_count, + } + + temp = env.get (LIBRARY_PATH_ENV); +- if (temp && *cross_compile == '0') ++ if (temp) + { + const char *startp, *endp; + char *nstore = (char *) alloca (strlen (temp) + 3); +diff --git a/gcc/incpath.cc b/gcc/incpath.cc +--- a/gcc/incpath.cc ++++ b/gcc/incpath.cc +@@ -480,8 +480,8 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, + int stdinc, int cxx_stdinc, int verbose) + { + static const char *const lang_env_vars[] = +- { "C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH", +- "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH" }; ++ { "CROSS_C_INCLUDE_PATH", "CROSS_CPLUS_INCLUDE_PATH", ++ "CROSS_OBJC_INCLUDE_PATH", "CROSS_OBJCPLUS_INCLUDE_PATH" }; + cpp_options *cpp_opts = cpp_get_options (pfile); + size_t idx = (cpp_opts->objc ? 2: 0); + +@@ -492,7 +492,7 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, + + /* CPATH and language-dependent environment variables may add to the + include chain. */ +- add_env_var_paths ("CPATH", INC_BRACKET); ++ add_env_var_paths ("CROSS_CPATH", INC_BRACKET); + add_env_var_paths (lang_env_vars[idx], INC_SYSTEM); + + target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc); +diff --git a/gcc/system.h b/gcc/system.h +--- a/gcc/system.h ++++ b/gcc/system.h +@@ -1317,4 +1317,6 @@ endswith (const char *str, const char *suffix) + return memcmp (str + str_len - suffix_len, suffix, suffix_len) == 0; + } + ++#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH" ++ + #endif /* ! GCC_SYSTEM_H */ +-- +2.36.1 + -- 2.36.1