From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 30 12:06:48 2020 Received: (at 44750) by debbugs.gnu.org; 30 Nov 2020 17:06:48 +0000 Received: from localhost ([127.0.0.1]:56509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjmdT-00031Z-MQ for submit@debbugs.gnu.org; Mon, 30 Nov 2020 12:06:47 -0500 Received: from mail-oln040092005071.outbound.protection.outlook.com ([40.92.5.71]:37957 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjmdO-000317-UI for 44750@debbugs.gnu.org; Mon, 30 Nov 2020 12:06:46 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KzrUj5C7nv4HErBmXCxCQKF1i+3k6l2a+HIP5iXkYu7HRxcMVa9hW43wWcV/sEH3XJy76GORPW47YP2cT1KhQQGjWZvLb65mo1KaF5ofQO5ofbV8JunuX92CzMrWktVllhVYsyFoboxJFmIOhttgNOeQUrDD2PA/y8g/JfWHykGjiWggNgkjpoVMOgesDjksmfnLrvPcXAX3FyjBNs+H1PuyCVF9GvqTw56/lWso/ZwpZrIEtNEYIDV99Tz0cd1N1fu44w42AySMKXcKLmT5oLGtlQf9ndJE2rLd70aWC1531q6BHCZnooGT1NlHRxhgM1PmtwwKZYMKr8z4VQCR1g== 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-SenderADCheck; bh=hSTNM5AdxH5XGfW4J0rruuxbtqcfchV5zzY/cTQP6HE=; b=KCTi9AZhaG9HEiMOmcfsMLSzFTPGTmdfenaun7TTXlduFgft9mrdXHltXXUR993R49ReQARlPnh7OWzk905IMdwZUYCmyo4FfXWwtp729DONk5XwPOM+WUvc3imrGd3ZNdyfs+bFAldgHf9iaLblRjxnGNH1DW+DMOjOmwsyF6rPRjE8IXgqZ7wpBYvmAuG5jFESp4vTrrqGl3CXeEBxQK313qSZUB6WbvbTz5L2cmBbxk5Wnu2Zz0ivgZbvGHdRU0vE7iOhr/CPT6sSCY62Iju17ZBXqA/1x2FpBkmnhDxjToYw1HXS+jhVEcOgsp0rM41BzJfJSq5z6IVDqn+Uqw== 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=hSTNM5AdxH5XGfW4J0rruuxbtqcfchV5zzY/cTQP6HE=; b=Hbu7ifkPl6F0OCgHqSzwtdj7bIU2l2pgUbHoZfm5tzpIv0kShHDy8jTEBUmFNg8c+SdYC+pbrm2ttZnCkBVwp1p5ir7+5opwU3o3JPYmODB13qUSl8ZzY6+ITswpLlFQ6TvjNmqQhHAjPkhHvKkVCm2HXz9QnHQbWMqlQO3DAMKdAw5/tYjgctNhocRuaCy3knfF+0qAHLC8OYTOfUkuxGDsRvkUc5KEdE8hdBEm7cE7xOknl/0AbfFUdinuo7nFm3jp409FTtPBIjMC5zxbJzuHOoNy1SxpjPbm+lN81pNqwq3ox3sLQA1ThhAed2g7LTIc8viAiP39657mWTG4bg== Received: from SN1NAM02FT017.eop-nam02.prod.protection.outlook.com (10.152.72.53) by SN1NAM02HT021.eop-nam02.prod.protection.outlook.com (10.152.72.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.27; Mon, 30 Nov 2020 17:06:33 +0000 Received: from SN4PR0801MB3679.namprd08.prod.outlook.com (2a01:111:e400:7e44::52) by SN1NAM02FT017.mail.protection.outlook.com (2a01:111:e400:7e44::115) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.27 via Frontend Transport; Mon, 30 Nov 2020 17:06:33 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:4FF03B4F4A374D6BD1CB755460E9126BD8370765B88747ECF1D86063E024DB3A; UpperCasedChecksum:94D93DBBF4EEC6CDD28986B05116D799C46AB4A1333297F7AFD357D06EA07EA5; SizeAsReceived:8439; Count:45 Received: from SN4PR0801MB3679.namprd08.prod.outlook.com ([fe80::d1ee:2418:4b27:4ade]) by SN4PR0801MB3679.namprd08.prod.outlook.com ([fe80::d1ee:2418:4b27:4ade%7]) with mapi id 15.20.3611.025; Mon, 30 Nov 2020 17:06:33 +0000 From: Morgan.J.Smith@outlook.com To: 44750@debbugs.gnu.org Subject: [PATCH v2] gnu: gcc-arm-none-eabi: Fix C++ header location Date: Mon, 30 Nov 2020 12:04:08 -0500 Message-ID: X-Mailer: git-send-email 2.29.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TMN: [xzWBBsZC4n/ROZb1KqE4uE1j4SPT61lG] X-ClientProxiedBy: YQBPR0101CA0123.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:5::26) To SN4PR0801MB3679.namprd08.prod.outlook.com (2603:10b6:803:4f::22) X-Microsoft-Original-Message-ID: <20201130170407.16902-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.lan (74.14.70.62) by YQBPR0101CA0123.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:5::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Mon, 30 Nov 2020 17:06:31 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e71480cb-e504-4835-86b9-08d8955248d6 X-MS-Exchange-SLBlob-MailProps: 7MJMDUNTCtz250ScV+Sy4FVc80en+J/Jk8VanmbnsQ3Zmqx+HjN3ZOTXiYxMprR+7Cu5+DM4m9UnTMNxasIWFA61zoYuMLxDO3tc5SNe6c0NuSJpVJmIUuLAFjNlpZ3ycc7Jc5j3SjlejtY8/N2QPoMyMcoe/o58UhTfohGQm+zT/pg1ocdexu/MefDmjSwZJhWV0bkzswrqgnnrqENhzoSjjjGs7CrYiUDL9I00ejBQHkWik+dcyPKqnNabv2a8l0PtMtKUwslOnUp1UUNWNO1Q/taSal8pE0GlT3sb4ZPpjloaw1WzmxYITOFNnZWKjr2D7d9GQaSbpFF23S6fsO0Jli/vJSsOm5dmEMHcfSWd7X+/egzpVVd578Zh3gMvjXTAfSTeEl3pAaugDIc1hMZjYnXjLhrfeyWMH3xvxMCCmfAmQ/oBU/7y+SlzEZx4Y93aVAbHzf8nhCDJD3Fmyl10OV/pgBiiHMFXWKWxZGcgXRW8eySgxj6hw9vI0DN/ZJeTy9QpJ4F84QYPDaqbc3xanvlSG3mX21gFGfCxabEIOoUfi3wtxbAbxcaGRmGFcgJTFP6X/DO/763GV0d4tnI289aZ8TGskfC809zptylTBQ1HhfJpBxOd+7ctot1PsJhCAVcDh4GMH6uIB2Q2oYqo8b2eNRsWUqAZ8iC9+HX5MIz73L3fSLkmG1Bf9FLnY+OrdiDVNKkpgFraKXeUrUvT7hKS3rHKyZt28hgYZdBcqrlY+IOOhA== X-MS-TrafficTypeDiagnostic: SN1NAM02HT021: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SqStV5St4hOtpfat9pB7hc7hstGN2VKLIc64FgRRqsZHRY0mU4EzYOBeN/rTDsbDtRRwO+3yrFuZ9CUBqr5jHW8UWxoOLRhy/7VLp3BNvisJ2silXKiodfUYOuPlsAk04h/dIA9IVyXsUmiKAijp8muSrBuxM27y4Ya7QggcIY2+RqIGS2dd14iB/Tc61zem6hk4EduYhByN/7fPsJxSlA== X-MS-Exchange-AntiSpam-MessageData: w0gmCiDlo1u9v6F+zqN++JMvxoxU0H2CAdWlSdi1fzS3TavfQ5fOcriMz8bVvonUUmvw3Q5LjBlJXhs6P6kDzCmQcyoeRwuWK7abhnzYONIo/HLGDLUWjwHSV/QUNBG+ajYeuUKIpSUqGfFpPMothg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e71480cb-e504-4835-86b9-08d8955248d6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2020 17:06:33.0431 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT017.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM02HT021 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44750 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Morgan Smith * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9)[native-search-paths]: Add C++ header location * gnu/packages/embedded.scm (gcc-arm-none-eabi-7-2018-q2-update)[native-search-paths]: Add C++ header location * gnu/packages/embedded.scm (make-libstdc++-arm-none-eabi)[arguments]: Change C++ header install location to include/c++ Previously the C++ headers where installed in the include folder, overwriting some C headers --- Apparently I needed to keep the original include directories as well. This patch actually builds unlike the last one. I've successfully used the generated arm-none-eabi to build a project that required stdlib.h (one of the headers that got overridden) --- gnu/packages/embedded.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index d6f487bd17..73375a211d 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Björn Höfling +;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -143,7 +144,7 @@ (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include"))) + (files '("arm-none-eabi/include" "arm-none-eabi/include/c++"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -313,7 +314,7 @@ usable on embedded products.") (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include"))) + (files '("arm-none-eabi/include" "arm-none-eabi/include/c++"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -376,7 +377,7 @@ usable on embedded products.") "--with-newlib" ,(string-append "--with-gxx-include-dir=" (assoc-ref %outputs "out") - "/arm-none-eabi/include"))))) + "/arm-none-eabi/include/c++"))))) (native-inputs `(("newlib" ,newlib) ("xgcc" ,xgcc) -- 2.29.2