From patchwork Fri Sep 13 11:41:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67924 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A049327BBE2; Fri, 13 Sep 2024 12:43:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CD73827BBEA for ; Fri, 13 Sep 2024 12:43:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sp4hU-0003kH-W4; Fri, 13 Sep 2024 07:42:57 -0400 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 ) id 1sp4hS-0003it-4J for guix-patches@gnu.org; Fri, 13 Sep 2024 07:42:54 -0400 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 ) id 1sp4hR-0005Od-Is for guix-patches@gnu.org; Fri, 13 Sep 2024 07:42:53 -0400 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:From:Date:To:Subject; bh=u9a7tmO2OQCa+j2f/z26Njg4BxVEv/gtyXgKJey4WJc=; b=pXfiVTYeyqDkBVaXYYeMIESFbAg+OZ/W2lSfgMLIe0DXTn3vhE5Mn6OoreoLZNd0Yp+ZQZiFVs2/bGgXP+5zoaw2jzWJ9LtLfG0h3J6RpRVcJVOYtats6h2UkG2W0btrlcjWpouxR8P0NAKbc2aEkUffZJhl/S/YB+3gz1DzrrmszM2Nz4FKErCLLGBvhatInTGL/2q2lhcunxs2WudmB06p03bup694aphpdaakVzB9ezWeTe3UtOciELEVBDZlz494tXGGF/LGYYB0MfTTorDJVxkUiYTttwhK9cq/ligrpN0bQ9lIW1JArx4F2UsoEzrgbSKhHbEkQsxPonFIUg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sp4ha-0008Hi-J1 for guix-patches@gnu.org; Fri, 13 Sep 2024 07:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73118] [PATCH v2 1/5] gnu: make-gcc-arm-none-eabi: reorder C++ native search paths Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Sep 2024 11:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73118@debbugs.gnu.org Cc: Rutherther Received: via spool by 73118-submit@debbugs.gnu.org id=B73118.172622773931711 (code B ref 73118); Fri, 13 Sep 2024 11:43:02 +0000 Received: (at 73118) by debbugs.gnu.org; 13 Sep 2024 11:42:19 +0000 Received: from localhost ([127.0.0.1]:42608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp4gs-0008FP-Ii for submit@debbugs.gnu.org; Fri, 13 Sep 2024 07:42:18 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:18621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp4gr-0008Ex-0o for 73118@debbugs.gnu.org; Fri, 13 Sep 2024 07:42:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1726227721; x=1726486921; bh=u9a7tmO2OQCa+j2f/z26Njg4BxVEv/gtyXgKJey4WJc=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=zM8EInemAmihmE0YCSdX615jipNTApB8Jz2bO8ikR6hKGr25s0Mf7bY7rgIIS4e7v PvO5+bwd7oENbhEMc38VGL7ZVrIobNaMDn5mfIqRiiqqm+ilfSjSiqn3yK5DFMmtli h/mnLNHkLIUuAUETCabvVipjUZr1ExYUFg6nWZ/4j8WkSWW06Wdo1lbRaaMC1ucuKV QiSt/izMvWevo3X7G36P33YXNeKO4iifxhCUAVddzSgnAWnNG2UXmKrOwJUARGGu57 uv6fYWaOoFNHaqZcLDYxPP9Q0QpV2J8/s1fk9k7wjM4p6IEREJtrItaowBFDBOXopM +BmuQPy1u/Jhg== Date: Fri, 13 Sep 2024 11:41:57 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 95377a280749f52788ea634a3baaad8b13e31c0f MIME-Version: 1.0 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: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This fixes native-search-paths of arm-none-eabi toolchains The toolchains CROSS_CPLUS_INCLUDE_PATH had C include directory first, and the C++ as second. Since does #include_next , the toolchains could not build anything using . The C include has to come later than C++ one. This is already fixed in xgcc search-path. * gnu/packages/embedded.scm (make-gcc-arm-none-eabi-4.9, make-gcc-arm-none-eabi-7-2018-q2-update): [native-search-paths]: Put C include path as last. Change-Id: Ib7e36e57e510ac87960375cad40ff0b9e749101c --- gnu/packages/embedded.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index bee65663b6..a7ba9ebe98 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -201,9 +201,9 @@ (define make-gcc-arm-none-eabi-4.9 (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include" - "arm-none-eabi/include/c++" - "arm-none-eabi/include/c++/arm-none-eabi"))) + (files '("arm-none-eabi/include/c++" + "arm-none-eabi/include/c++/arm-none-eabi" + "arm-none-eabi/include"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib"))))))))) @@ -423,9 +423,9 @@ (define make-gcc-arm-none-eabi-7-2018-q2-update (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include" - "arm-none-eabi/include/c++" - "arm-none-eabi/include/c++/arm-none-eabi"))) + (files '("arm-none-eabi/include/c++" + "arm-none-eabi/include/c++/arm-none-eabi" + "arm-none-eabi/include"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))))