From patchwork Wed Apr 7 19:09:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 28354 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 7654827BC6D; Wed, 7 Apr 2021 20:11:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C183827BC6A for ; Wed, 7 Apr 2021 20:11:19 +0100 (BST) Received: from localhost ([::1]:55880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUDaA-0003jM-Mk for patchwork@mira.cbaines.net; Wed, 07 Apr 2021 15:11:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUDZv-0003hl-T0 for guix-patches@gnu.org; Wed, 07 Apr 2021 15:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUDZt-0002Cb-OP for guix-patches@gnu.org; Wed, 07 Apr 2021 15:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUDZt-0003Gr-Id for guix-patches@gnu.org; Wed, 07 Apr 2021 15:11:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44750] [PATCH v5 1/2] gnu: gcc-arm-none-eabi: Fix C++ header location References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Apr 2021 19:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44750 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44750@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 44750-submit@debbugs.gnu.org id=B44750.161782261612510 (code B ref 44750); Wed, 07 Apr 2021 19:11:01 +0000 Received: (at 44750) by debbugs.gnu.org; 7 Apr 2021 19:10:16 +0000 Received: from localhost ([127.0.0.1]:45232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUDZ9-0003Fd-GR for submit@debbugs.gnu.org; Wed, 07 Apr 2021 15:10:15 -0400 Received: from mail-dm6nam12olkn2013.outbound.protection.outlook.com ([40.92.22.13]:16582 helo=NAM12-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUDZ7-0003FI-HL for 44750@debbugs.gnu.org; Wed, 07 Apr 2021 15:10:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fqbEOte2g2Ba6dCnbaj6jmsiTSwq+5FL7d+AqIdWKXPAijx0UEjBXACSMDwApJTKVSCeuTs/X04HM112MLpSrnR1hzKRdYzgPFsjldW4FhSoVDmu+g812JiL6DrBxi3eqk25SNY9wOUxLylfarXZkzwurC0xiWNTy/HlK7y8IaPcJffSj5c33jE4kASnK+Yi14kZ9Ci2lU1DsMkvJBFfaYGUXUyG5DOk6Dgb41+h+IY9S2EJydHhgy2mZphbsMgpAoUn86wv0pIPZEbDepL3F/CS0j6mDqVhazTO3uRu7zDYI292HmHRAlAABdxIAMY73qVgWKjGgK/5nCMk75wjwQ== 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=zwXJe35hQEcTWL5S5jQq7Ilxv30rLZxR8Z9SUusyb3M=; b=KOVmPjKYJToUdZVsRHZpAfUI3E9SPAmt7RlOEFJClT014U7cu5fquCmxl0ZHYzVhxxLRGmp4pcy+0rxSULuMkG9Wp9YdgBtlO+Ih+lqNRWQ9Uc8aDMu4x3GZiFRG+0cFfrFkNiiw2DpFpaK7qyunZcAR1ezYknVGC8hfhdotmLtXYg/YIb4oBHH69RHIGJf4A6aX3+5Ds5U/rkvMGPGy+xVpn1AwjSslkD5Y5axxX013ueyfBXR3hgtz6QIkKU2HyZJbLIq8szB3tpvblEEUss+nczOuuztsMo4a0l3ke3JunJGWOJ7UGrIbu6srQntUWUFqyk/l4mvICi3cvde7Aw== 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=zwXJe35hQEcTWL5S5jQq7Ilxv30rLZxR8Z9SUusyb3M=; b=cogMg8df0K45WSqs4kEfnbJxVM3zrfrLJ1rZcPcmZWw/7Y+6stK/4BdWPMZAmgUsBzLHGcJaeoP7Y5QaGRbI0sJ9hYo3ZGHwflrmXzdHPoFb5fcXm7kQjRyK5LcnD/Q39yuI2LLlHutc8Ifcnq5MH0BbC97BmNWYfCTO+fBN7kw3lrC0UjlVU2caVdq/P3fh1FeRl3yJS3Dij5XXQhYN5GNHjwLVsN9uclFThrwhJEB9DyaGt5h0sAUIjbqX7P0fTnaUBQQFT1F+dZ566LuLvv7hMp/mUudNnf3zCM0FYohypw/1XLS2hhYFzPQGMiajUc3SRx3Pg7R1u8DHyo234Q== Received: from BN8NAM12FT039.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc66::4c) by BN8NAM12HT065.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc66::417) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.8; Wed, 7 Apr 2021 19:10:07 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2a01:111:e400:fc66::4b) by BN8NAM12FT039.mail.protection.outlook.com (2a01:111:e400:fc66::234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.8 via Frontend Transport; Wed, 7 Apr 2021 19:10:07 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:EEB5CE9B6893264E0E88AB06733FF2EEC608A4125FBA4D25DAEA2F99604DE74E; UpperCasedChecksum:E90E9D22D7684A4576ABA78E0761D827427AC9AEC60FAB7E6FF42970E693672C; SizeAsReceived:7292; Count:45 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::b92f:829e:18e4:7ba9]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::b92f:829e:18e4:7ba9%2]) with mapi id 15.20.4020.016; Wed, 7 Apr 2021 19:10:07 +0000 From: Morgan.J.Smith@outlook.com Date: Wed, 7 Apr 2021 15:09:46 -0400 Message-ID: X-Mailer: git-send-email 2.31.1 X-TMN: [qsEkqk7sDzlZ8L5MvIQ9jOXmveLzKsRY] X-ClientProxiedBy: YQBPR01CA0097.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::33) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20210407190947.28938-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.hitronhub.home (170.52.80.149) by YQBPR01CA0097.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32 via Frontend Transport; Wed, 7 Apr 2021 19:10:06 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 23f8d3a1-2589-463c-d000-08d8f9f8c19d X-MS-Exchange-SLBlob-MailProps: 7MJMDUNTCtye10tpKFP8oCw5TLaO3Qkr7ddMYp3qkUDw9kTnU83Yc21mH9FFuDJHtVA0GIoyAmfsPaiC+Q0rxU5j26bvt1CmorZPyY/o7tUsIeEjvC09R3g3jd1fjDeroWFKpCMXUPDdP7LAgb825lkcSjn+evGFhHiQaRc1cWjizRDf5VouzbsCsHYyLR41TnNf1hTEyD4fGF6dp8/K4NSEt3LcCUxxabkjUvZdyztpLzENkRk2ER2NvNMayjUXQZiF638bLDXkqPk6crlW0mGUo/df1OjbXebqFBhMKuMPCB8fz8Ic5wY/8JgRqoKZ/NByYwHYIlvX/4XMBL0I2GDjPFs8jl85+JKUhn49NkgoUaZBbDQB+y0ij14G4SbE41Ri5oE4tg9x5bSpHny7oU0hVxN2oIwUcHAOoV6STzrOHWsqa6SYj2mWvc8pTjS7O6DiwtQy5GPVZLRl+d1WbtbtvmF5/OwRDMh1UUcgKNHFQCZvxRlwgB+/JkLi7o7qWuM9q2tI11VAUqihS16DgbOqje6eIeD6HWFHltRS2xmQ3PA91MfIh8HiNJXg7rG/oL+nYelbT5xdkjsO8gK/lI3UAbzXVyAVrFE51+KVR6553taAqoxlIV5Cz0ZOMy2r1941yDDr+E1YaMy+f8oyhzdE++/9FfgGBYxOTl3aMD87qd7clvujzEd1HOYvlzb1+v9Y4ZDqJSMG07hMhB0fqzE0J/l+DQOqWzEag3rfkqPy6yXTuQ3hiw== X-MS-TrafficTypeDiagnostic: BN8NAM12HT065: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: clgPj9LhJq4aq7Q/CynyO4kiEJzV5tYi/a093hBxwYN4jgUHwmLkvIvpykIQAREmCyajJgEqFulenUn8uVJpCC1KHzFVZE3RBmjIaw+56JPSduqDXeeFwOwmWfnX6jb76zLX3BrGGpbk3nOZYy1FEPtY968k18pou3P1/f0Gfy+T8IxANc1fgT1nzfkANj6Ox5husRFWi4rvITjsHE7GWROJG9Ly8crznm1Mu9hh68WIVUxNXZw7q28SkeK8XCjz1JUa2Ns+bRVNup8E/m4bRxdphcTWp21jivwxHq94WHTsaO6ftTqPIWlZ+0hsHhDAqmvHOef8I3AAj3ZTUUQJuUPQyqbP6yl8KQBysTkIpM3F9W8E77LMY12FKnRVb9oo2frULx2eG1eiKFG2BP52Ng== X-MS-Exchange-AntiSpam-MessageData: AUFoXNy6ZA3SfkRn6SA/SQTm2FBgc1DbX3wOeHi0IV75S2QKGHyWDsDLkikYVUCpLEjN2SvzYM+ceT00s2By+NznLky6fKOT96lzjMeM8fgphJzsUZgy4oJ9iZ6Ted5PAKhbxTBwCrkOFjj+IeHF5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23f8d3a1-2589-463c-d000-08d8f9f8c19d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 19:10:07.1753 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT039.eop-nam12.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: BN8NAM12HT065 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9)[native-search-paths]: Add C++ header locations * gnu/packages/embedded.scm (gcc-arm-none-eabi-7-2018-q2-update)[native-search-paths]: Add C++ header locations * 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 --- gnu/packages/embedded.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 413760ab72..a3f1d85580 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -147,7 +147,9 @@ (define-public gcc-arm-none-eabi-4.9 (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++" + "arm-none-eabi/include/c++/arm-none-eabi"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -317,7 +319,9 @@ (define-public 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"))) + (files '("arm-none-eabi/include" + "arm-none-eabi/include/c++" + "arm-none-eabi/include/c++/arm-none-eabi"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -380,7 +384,7 @@ (define (make-libstdc++-arm-none-eabi xgcc newlib) "--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) From patchwork Wed Apr 7 19:09:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 28355 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 32A6E27BC6A; Wed, 7 Apr 2021 20:11:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A1D4527BC68 for ; Wed, 7 Apr 2021 20:11:19 +0100 (BST) Received: from localhost ([::1]:55888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUDaA-0003jS-Ox for patchwork@mira.cbaines.net; Wed, 07 Apr 2021 15:11:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUDZv-0003hh-Se for guix-patches@gnu.org; Wed, 07 Apr 2021 15:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUDZu-0002Ce-4B for guix-patches@gnu.org; Wed, 07 Apr 2021 15:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUDZt-0003Gy-Vu for guix-patches@gnu.org; Wed, 07 Apr 2021 15:11:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44750] [PATCH v5 2/2] gnu: axoloti-runtime: Simplify build Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Apr 2021 19:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44750 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44750@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 44750-submit@debbugs.gnu.org id=B44750.161782261712518 (code B ref 44750); Wed, 07 Apr 2021 19:11:01 +0000 Received: (at 44750) by debbugs.gnu.org; 7 Apr 2021 19:10:17 +0000 Received: from localhost ([127.0.0.1]:45234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUDZB-0003Fq-0J for submit@debbugs.gnu.org; Wed, 07 Apr 2021 15:10:17 -0400 Received: from mail-mw2nam12olkn2012.outbound.protection.outlook.com ([40.92.23.12]:20481 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUDZ9-0003FL-3A for 44750@debbugs.gnu.org; Wed, 07 Apr 2021 15:10:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZYGy2ZVlfi0O66uMZDGm2smynHP+kbCm/CI2fz1jUTi68Ua6RgaBOwGJMOSxBQxp3PLBHmXx0it3cRSHWuR4DvZYSPIjGKEaHLdSoYbKPK4a0gX1t8bfQl5rPoTHqc3qwqrperXao5teuddMryTdQ2mJHxqAUuDpbCqJ9PWoq3UZ8LxPehVe24rf2DkiI2Y39voDNRt1P0WleNncT0WOnqtLCzmCKoH0mp1MMqOZCKnbcQnEqkD7OJe/2OVNMpNEyFGwSGJmUAaF9i4VX7Z6O3hS4O6PNC0smrL8vhyklmuZ9+KcEntfrslOveOOuvG89uo7vB5OR0xMoZQSjAC4Wg== 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=aNWQUXNexpPxus3im0oVXtj+mShh2VfzGcbB9UOfXS0=; b=gw4cDol/yWVE7HBWdNtCs0X2kmFGqBFSIznl0msLzTjXGwOYkt8BMiesHSNtSDK1Gmgr/TQ30U9HaGwhbslL3cmCBLo7TPMmKWTZhNSygVpf9c9cK78XOuqJK2JH9XWez8i2tySLux9dpiEMQmUTWR1ISmENf9mWoKv1WI+eroE7A5JXoPSO9wP9qIxkPGX9juigX70IkcDkB/Tfu7qK6tSDYpIAgE/6q3oJJC36IGpAu37+Q8w+OIMxeuWHvNWI9hDV+ZRuLsppEs9cMWFQDTyLP5zov8twZ43cZGvAEwcYwvv8yMZZVTJVv9JEw5FRciO983NyY3sUcXAmBe0tDw== 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=aNWQUXNexpPxus3im0oVXtj+mShh2VfzGcbB9UOfXS0=; b=oo58CfnjcXRKCsJtJtjaj06hJcP5ifXVljqbmMeCnoJ8QfV4K2qwQrc+0fv85uUbZdZ+j7N+dWHQOs1JTNSZlRI+g2oy4WwI+8+sjmUyMUsUZU7qUaeGeM0VWuXfM8gOt5xYg8ta4tQAFAAVKuR0oopfY9S4T57ETjjWKhgUMk+D4kNh1NtDzUQbrvlVEYX1ys9uKT+1fn4fXkQCdYESxKiWpRdNdA6PSrwX4P3CATYVFo7rs1N5wn8+nwqBlXh8zEUoBMcp3AglKrb86fYWje2E5+D7+Vle8okta9r6Oo+Ajyrp4cwOQCe3qRBzyx+QktWfICt7OgdwV4PM2uCD5Q== Received: from BN8NAM12FT039.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc66::51) by BN8NAM12HT227.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc66::481) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.8; Wed, 7 Apr 2021 19:10:08 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2a01:111:e400:fc66::4b) by BN8NAM12FT039.mail.protection.outlook.com (2a01:111:e400:fc66::234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.8 via Frontend Transport; Wed, 7 Apr 2021 19:10:08 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5FFDD560847DFA71E1B95AFE84BAA3D96EF539AD1D693F9CBF2ECF414B1C1121; UpperCasedChecksum:6E6B713F71DF1363C574AB39FDC4A99A1AA9AF35EF9FD91588EA31C1EFA8B693; SizeAsReceived:7402; Count:47 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::b92f:829e:18e4:7ba9]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::b92f:829e:18e4:7ba9%2]) with mapi id 15.20.4020.016; Wed, 7 Apr 2021 19:10:08 +0000 From: Morgan.J.Smith@outlook.com Date: Wed, 7 Apr 2021 15:09:47 -0400 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210407190947.28938-1-Morgan.J.Smith@outlook.com> References: <20210407190947.28938-1-Morgan.J.Smith@outlook.com> X-TMN: [Uuio/1QxkHKlIo9QpbQHeG464RpnxWaZ] X-ClientProxiedBy: YQBPR01CA0097.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::33) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20210407190947.28938-2-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.hitronhub.home (170.52.80.149) by YQBPR01CA0097.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32 via Frontend Transport; Wed, 7 Apr 2021 19:10:07 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8b05d203-7004-4ce6-1047-08d8f9f8c25b X-MS-Exchange-SLBlob-MailProps: NS9Gj58uCj3bi/rt2QlK2tx6eCtDNJkS5hHdSGOuUKUm0MKx/9SyJzgTPsRiC1QIxaNg0RBHbt52V/W0jTAS/hvszwidtRpmGPzjcT/um0sbVyDngBtI7GbXuPzSV76vo673WvyeU1DtjIKssSDtNQHHa9X1jafoYLtLigM7SOtLJrfhnFnXUvjVge4MlZY2ULR/AvavdXrq5kTnFii8vBt3L8uKcbCT/SOwHi6SmI5REpH9cvt2fRnz9QJILrVSnG//8/dWo/GSmnyq9v3yrfnB1ekDclGXxOJbRwewDySZYh79z9gukIODSqUkBWuwzSAIBjml4CfsBiKqyuZ3ZWulfVOkVXjFjllEuvZfvgh9pKZxoveLKH0n72ZzGHTMmoI0vyIBNpm8kIL8nMO08WXObLOQj7+kQ8b8qNFa0vVTY7hR4lirYs51GGhORVrrVIuyzFCKavZuH1orgU86dva/dgEV948DP0aLDs95D+Nymq7QpXxx5dFOXwhCYX3r0zlxtz/pl+ZOEdS9Gn9G/t9il9I9PqlRvMyRNgCkpRxa6dA7GWjBwtHeA5MoD6LDs04EXIg2+Dvm8+4oXk55dm97dOsu/eV4Y3wDeZX67kXVbFvHfXUtZUk1ZqGMT1j+/aOZnihO3YFuFJOD1qdjmSc6vOs30PbfvMHYtx971WnmnsWjR2hoif3UniNI32I8vgtLsv2ac/XhJ7Z06cS/zw== X-MS-TrafficTypeDiagnostic: BN8NAM12HT227: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NKL2ZPvUbySVah3rAwETwtEjgDae+lc57B99ABDkVUX8CL8RWG7XPNgUcVcVCRGgpp27yqTgg1g53XAhjbhmuMNM3x4Na1KeHCcPTVyKUkzNeRdZ5htBqBIQJa9MlZuM7JZoYTMlwlVfA1M7ulsBs3Y9Kfz+gyGLW+52p7PryMKRs8yVqXDqSQdS4gZVjBIznpGJdZu1LkjM72dr2Q6z/wlRUXItFEwU246BKBqKcdq5W2ZOs5nNYoyyJORTMttr+1DzdDGNMHtgqgt51Y8afd1b68gIDmY0Ad72KRqfqzFG+MBuVpJjX9O90IUUuwWP4X1tvNanKODuHITw8KCI373C9JA5OGqpF5bvln2L/preN1P3/k7d5Oj7YZC+G7DLns0/eXvz+tD2IYKx4SyXmQ== X-MS-Exchange-AntiSpam-MessageData: mWWXFCz6+cnEL5Hc79V4tPdkj++Hed5pzw/EnkRQ0KA8x+004qGxF1fXwLoxCX01AblBWTEaXPIvp2C40GOsbiEFS4OyM0Y9foyOfb2m6zEltOz+A5UGQHk+W53FdihsqQcCeKiIr/bjJxU5v132Mg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b05d203-7004-4ce6-1047-08d8f9f8c25b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 19:10:08.5635 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT039.eop-nam12.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: BN8NAM12HT227 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/axoloti.scm (axoloti-runtime)[arguments][phases][build]: Remove unnecessary environment variable assignments --- gnu/packages/axoloti.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 3049051486..0b12e4fe29 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -147,18 +147,7 @@ (define-public axoloti-runtime (delete 'configure) (replace 'build ;; Build Axoloti firmware with cross-compiler - (lambda* (#:key inputs #:allow-other-keys) - (let* ((toolchain (assoc-ref inputs "cross-toolchain")) - (headers (string-append - toolchain - "/arm-none-eabi/include:" - toolchain - "/arm-none-eabi/include/arm-none-eabi/armv7e-m"))) - (setenv "CROSS_CPATH" headers) - (setenv "CROSS_CPLUS_INCLUDE_PATH" headers) - (setenv "CROSS_LIBRARY_PATH" - (string-append toolchain - "/arm-none-eabi/lib"))) + (lambda _ (with-directory-excursion "platform_linux" (invoke "sh" "compile_firmware.sh")))) (replace 'install