From patchwork Mon Nov 30 19:09:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 25483 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 B9AEE27BBFA; Mon, 30 Nov 2020 19:13:14 +0000 (GMT) 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 4B19227BBF9 for ; Mon, 30 Nov 2020 19:13:13 +0000 (GMT) Received: from localhost ([::1]:53586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjobn-00014T-RI for patchwork@mira.cbaines.net; Mon, 30 Nov 2020 14:13:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjobe-00014G-QH for guix-patches@gnu.org; Mon, 30 Nov 2020 14:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjobe-000055-IX for guix-patches@gnu.org; Mon, 30 Nov 2020 14:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjobe-00009z-Cm for guix-patches@gnu.org; Mon, 30 Nov 2020 14:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44750] [PATCH v3 1/2] gnu: gcc-arm-none-eabi: Fix C++ header location Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 19:13:02 +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.1606763549553 (code B ref 44750); Mon, 30 Nov 2020 19:13:02 +0000 Received: (at 44750) by debbugs.gnu.org; 30 Nov 2020 19:12:29 +0000 Received: from localhost ([127.0.0.1]:56695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjob7-00008r-8Q for submit@debbugs.gnu.org; Mon, 30 Nov 2020 14:12:29 -0500 Received: from mail-mw2nam12olkn2052.outbound.protection.outlook.com ([40.92.23.52]:37568 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjob5-00008d-Gd for 44750@debbugs.gnu.org; Mon, 30 Nov 2020 14:12:28 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c+A5iw6FJIRrfQaOFLnvGcBQwexoaLYcvnt16EKe6yf77DGABRdDX8Jfy0hnp/Yd610CNqFuYd9UDK8P5euiK07s2dxpnXJMgpQTe6CgOr/JOW8cVtKOqs8hRiVk35SNVkoZAKZercG1UtiiqCht4iJGfLF7RXrH7jCzFbJlPxI7qZ8Xlhvb1GaN86WHohOFWpEhknjKayB/Hr1LO/tpq8EIB1OvYM+EgiSpBn4MyqXHAecrRGJPiWJ2nHqM6H48qlh5FMcJM57MkQQNMbjNLqCk6D+PuPwCWRKnp9LZo09w0LjkqocFMRnD07BxdxF/BgkI27fnPs6LPwvzqpXMLQ== 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=voIqpCuAigGeJMDjMLCLsMgnizt5ERCvQdo3xaC/gjg=; b=HhEB0fdyep9RmOeTcxJjiKaj3ff5tKB4D5SBVJeHi1y5ptT9tHJM/w7Y5FiNP/Uet7lLTUzBurLsm2xsYZ+w6gkSNN53Z19SXhMl2F0yU3atXHRmq0UGeoziLeW5LTvdUwZR7OcuYFBynpsPyMVm86SG9bAJYlzfuM6ONZnCTv5nH1DHfNl0bP8FFdjukVr2iseAAQIZN1yev8G9RO9zOLa0yUr0zGcBsFuqt02uFjE1T7m9yV4X9YY61tUXsSP79jR+Sgnbfd0g3GlrgETwMAhwgYLPNTndoCVA0mKret6srUSoAWxcl2G8ROEvYAzcJloaAgWELxwtv2TPFbESCA== 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=voIqpCuAigGeJMDjMLCLsMgnizt5ERCvQdo3xaC/gjg=; b=JQxPBZLB8anW46ycjwFSLjZWLsFrGyrGFzhqPres34QkRxN09TwJgBxnsVpfssmTOJzkMEf9oX41KV7qQyEDu6tVdfXbc1mAM3DLgH0Mm45fkvN0+Q27CJPb7OXPISiYYPMqC8/7unRfWH+c4uduu/0cPFZOm8wVdwTqsgq03GwtuzcU6lYb67Z3ZIrFREuQu+v9skdkOw/KbSQTfun2Y1I8h5FK1pROCx58rxRvcAULcG0oN25Z/yYYt2EGJ+sLnZqQZfltHrnSxpiuNEe/+KxB7aqyUPs9ULCbxbRULy/Il92UanQaK2Oxzwgu4TdyFLS87tMJ/Mu2XvGhZIpTKA== Received: from DM6NAM12FT008.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::4b) by DM6NAM12HT131.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.12; Mon, 30 Nov 2020 19:12:20 +0000 Received: from SN4PR0801MB3679.namprd08.prod.outlook.com (2a01:111:e400:fc64::42) by DM6NAM12FT008.mail.protection.outlook.com (2a01:111:e400:fc64::271) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Mon, 30 Nov 2020 19:12:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5FF831FB82F5FEB68C914BA2CAF001D3612E1B7694F473525F4B95ED628E7AF9; UpperCasedChecksum:0991BFF37E306A223E7F570C1B3E43A24F2FF1E159BFF1615F5FC5AA26F8F325; SizeAsReceived:8562; Count:47 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 19:12:20 +0000 From: Morgan.J.Smith@outlook.com Date: Mon, 30 Nov 2020 14:09:18 -0500 Message-ID: X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201130190917.2689-1-Morgan.J.Smith@outlook.com> References: <20201130190917.2689-1-Morgan.J.Smith@outlook.com> X-TMN: [wxiWlUBWAuAoXP/KiQEE4YwQa0vBs8Y0] X-ClientProxiedBy: YQBPR0101CA0057.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:1::34) To SN4PR0801MB3679.namprd08.prod.outlook.com (2603:10b6:803:4f::22) X-Microsoft-Original-Message-ID: <20201130190917.2689-2-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.lan (74.14.70.62) by YQBPR0101CA0057.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:1::34) 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 19:12:19 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c18c90ba-eb58-4928-7772-08d89563dbe8 X-MS-Exchange-SLBlob-MailProps: 7MJMDUNTCtz250ScV+Sy4LyO6Z1kuzlGh88smjhtAd512vsKC3BqxsbgBkPfUp6/IQyzREfbhrLWnyDrJ8uuz42gaauS2JufJ5ZZeqwHCKW09TaEaU+NoLSliKLSIdb1CwLmwgsci8dAhalPY6y3YRSyZWAmlxYDPfxxDKrQiF3d3Hy9PMjzI+IRA1Q2yIfk/wU+/1rkYP+PuVZc6Ecw1AsZLwYi/UDmI5npm1WJMsB2gh8Rim59MUowNQZwO3BsMFmows3aVpOm/zS9ml1tV/L5IZbcet9SbmBXq0tQMeWobw/9qBfU1Zmj8kHn9K7Y/sPfGtcsKLp0gDndGAWFnebsUWF+8dQEQQRCX8tWB7wm6JGcy4vCLdkPyhkgDX7DyFLjyqZpUHmEs16PbQ32hSEkxDcCaX7UJz95vUxTrpv5MNQwpD8Li2x0X1eOCv97UNpVZ5FBftQ5obULVnVpnmqza3flXXzdV2l6VMwZONvJ5rCJnI0PzVdOMStixP+fj/Db1GGsKW22YacX6YPWjUiPMDxSqNZ1zLx836/FsKLAegx9OnCuzLlw1XJ/a8TgHx/8pLD6eg5qfvGewTSzMi2GhbqbfdGqTpNdh8LuULhYdLCu9KEaSyru/0r6iaPRF9oy+ZuEGLM6nSSB4kjgOpRH0LgV8FzuN0wuweZtCvvcVVBxOFfRrKEEGvyg3hbCefj2A77M0scuI7JyyMBpCgoGy9ebsbImNO7XaTueLmLsXjlbOpbwYA== X-MS-TrafficTypeDiagnostic: DM6NAM12HT131: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lUePFgYieZtUiKb+/QOm0okgqfVO9LwMqd8qZZtO+j+9GFP7bjLOJ9PaEPa4ywfhXQlY1Cf1d7/yho+5XEk/H2ydv9+UHf+rSwdeQbkbd1c2FdTUSYUsYj6T17vLvdK8iGZCna06xtZkhi/M0GclAbNz+cIEWVz1VuY04QGemb/DGUdSUzql3p6GErtUyYu0v7Jo55bp9OxWdtYkSvWINw== X-MS-Exchange-AntiSpam-MessageData: P75gAPFj6eoxjPnBfi/J/jvajfhjiCw8zLVBg8yEFOSBC+tbCZMfehoyYn8xRyjfWEzfxr7zhtRCr8v/vLeDFB+iDzU+uBrB/YlUdBNdGdM+2p/fO8mxlO7kGvkkTPjEUNGRT5PHJBwO++kLoCRK2A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c18c90ba-eb58-4928-7772-08d89563dbe8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2020 19:12:20.1568 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT008.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: DM6NAM12HT131 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 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index d6f487bd17..d2e2e6a676 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,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")))))))) @@ -313,7 +316,9 @@ 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++" + "arm-none-eabi/include/c++/arm-none-eabi"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -376,7 +381,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) From patchwork Mon Nov 30 19:09:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 25482 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 7250527BBFA; Mon, 30 Nov 2020 19:13:13 +0000 (GMT) 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 93B1027BBF8 for ; Mon, 30 Nov 2020 19:13:12 +0000 (GMT) Received: from localhost ([::1]:53594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjobn-00014j-Ks for patchwork@mira.cbaines.net; Mon, 30 Nov 2020 14:13:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjobf-00014M-5Y for guix-patches@gnu.org; Mon, 30 Nov 2020 14:13:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjobe-000059-Ue for guix-patches@gnu.org; Mon, 30 Nov 2020 14:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjobe-0000A9-PZ for guix-patches@gnu.org; Mon, 30 Nov 2020 14:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44750] [PATCH v3 2/2] gnu: axoloti-runtime: Update C++ header location Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 19:13:02 +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.1606763560576 (code B ref 44750); Mon, 30 Nov 2020 19:13:02 +0000 Received: (at 44750) by debbugs.gnu.org; 30 Nov 2020 19:12:40 +0000 Received: from localhost ([127.0.0.1]:56699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjobI-00009E-Jk for submit@debbugs.gnu.org; Mon, 30 Nov 2020 14:12:40 -0500 Received: from mail-dm6nam12olkn2011.outbound.protection.outlook.com ([40.92.22.11]:16225 helo=NAM12-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjobH-000092-6d for 44750@debbugs.gnu.org; Mon, 30 Nov 2020 14:12:39 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eG4nVp1OydQr5oUBuu1co2j5AkBRuUgMxzcj8IneClHif7UgLuGfqmL48rje7EAxne7PwZ6Zh3diweJwXJZ9OdGVKSFG9e8CKeDb8gDyqc+1s9yWxuOCqpKjyL00Ocvjd5aQNYe/CnLFJEUqAaTPjK3Stx106nahFpjwHnND6u78jXQlFZpVsBsfsEjWrgE8MMZePkmEMrt6sDuU36byoe1E6PVBBXlTNR22ui4XN+zkKnhhH5elBYjrBzhcxG/WP2O0qPVD/iabG1anSYUdEjfuNxZJcnPJQOz6FmaeqdyOK4hei7FTo1HR6DvGtawajl2ppW2fsRGEXFF/n/bwPw== 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=gEmLGHEv6UMjFGG9P6iuX64uLT/7PZMx/RHQzD5CQso=; b=dc1k3lW7WI4fo7X/8sp6lk+xbwETxuVarkTkTXxBlamIs4m14zN3g5ZTVGZtFArafKgIHx4dgqVzhyL8ihl1u7G3XltavDXQszZRh8U4wQcUaGdAS6f20nj87kCpqlAHe0ETde5deEtlRyvPABPeK65n29OP1tqva/SCcIt+P9PIWV9eEh6wE8fyiyzoZNlo3EgBTbSq1VyZEIuCC4tjdo5aXdbqwMvdfX+0SR964TbCae/P33M0DkrhyAzya8cXqn0Y6p0oZq0GrZxPgzxim5V+hlaQTDvcbL6n+hs/84S+A+eNfkET1CLdBonkXRJ9skyWPZ5LcTCVG0wJnh83eQ== 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=gEmLGHEv6UMjFGG9P6iuX64uLT/7PZMx/RHQzD5CQso=; b=HaY7Fu6vG8PdqaixIhFxYMu2KsW1WW7YeHQRoYKigwj6U+gIQdVBsmhmGdlI5m/e1rX/lxvQ+i/0/rVEz/5703i95WJBH1qbGKu6lQIiIEhaxhbBTFpKbhsuBhh/PWhm6sg8QFZoPugA1kna5Ph5cnXkkcy3EBesnXExU3/Plc/Zcx5iKt9ILAbBoBcWS08Ds7G7eeB/Ihgv6g4bMPnTGhi95TgM1KzJEEk1ARunEVsNu/Nj76LH+VBcRrnNimnDMf09EJdUaTnsVRF8xVT8W6XQzx5uCbxI3iQUwgVdPXKLWq+iAfEhL8kr2o3/Ql5w/KNdJ2maDP5+KVpX43d5CA== Received: from DM6NAM12FT008.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::40) by DM6NAM12HT022.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::331) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.12; Mon, 30 Nov 2020 19:12:32 +0000 Received: from SN4PR0801MB3679.namprd08.prod.outlook.com (2a01:111:e400:fc64::42) by DM6NAM12FT008.mail.protection.outlook.com (2a01:111:e400:fc64::271) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Mon, 30 Nov 2020 19:12:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:723BCE241A20E018D6FEFDD3D4E01563BD91BA8E82D78134A3E3BCBE04568BED; UpperCasedChecksum:05C3A945C1237246E852139C073AD1388C50A7158919A53487DD886B99AB6305; SizeAsReceived:7425; Count:47 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 19:12:32 +0000 From: Morgan.J.Smith@outlook.com Date: Mon, 30 Nov 2020 14:09:20 -0500 Message-ID: X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201130190917.2689-1-Morgan.J.Smith@outlook.com> References: <20201130190917.2689-1-Morgan.J.Smith@outlook.com> X-TMN: [p2RpzGuh2zPM+0SeqZo1ixugQ9Fyfuoc] X-ClientProxiedBy: YQBPR0101CA0057.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:1::34) To SN4PR0801MB3679.namprd08.prod.outlook.com (2603:10b6:803:4f::22) X-Microsoft-Original-Message-ID: <20201130190917.2689-3-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.lan (74.14.70.62) by YQBPR0101CA0057.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:1::34) 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 19:12:31 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 57c66c0b-0fb9-4f1a-3107-08d89563e349 X-MS-Exchange-SLBlob-MailProps: 7MJMDUNTCtz250ScV+Sy4LyO6Z1kuzlGsVaVjJBiRCWl/zsbsZyfYbrBMBLX93L4Th+NwBjCPJsFW85Qh/KAOxlKDfRfiQTs5pop77334SN/AkImXjUH3svenzDTfg4ugsts9pvOEe2YODzhvToRqYl4AVHt3lssmpjmr2F9L7wyTI+/6nw39ko4yzKDUkK4rswtbLhT/8FtZ8gz050dG5d/9L6VMwUdhxoTdgabPemyrk9jbVwMP1e8mLLUEGQTrnJMHsz8yUrZJSyHY+p8s8d0lObwAeyjv92w3uDN/X9DJ0BDGXACfNk/uHP3HhLbXPWFyJdFuqNXQFoxjMfa0i4MaB1xe6jDJSg1SZokZ6QKni+8aSMhl+ENoiaenmyT7bmkg4SQqZYXethM3Jrlx0TIPJLLOAiyMZRwhi2xoxHAjjz8T6dFppEzESfXX7BEyaTYA2W5VBpHizLr8XUPdq70Z9UkTgDDp+g+8OotvODDzqG4dahn1pUMINk4edjtDCffukuaK8+NbXfSI9UdrpWn3Y34C0dAq/e6fwc8XVYoxdR/V+0+aqt8YI2McPy/bhTlQ5W8ZvS6esc9RGURNqczIjfFHqnhl//ytwd0mm9cBAIh4QQ3a+y+r9gE1BztvF8ot4DwMbzPbdiJNXIWUnUwXnw7vB4cnQue/f1fghWAplt4LAxCj5DzJdy5fK+o2PbRk7Ugs4V9JF+tXjW472njhpdsAcwx4MtQG+JyevlOuEXtQ+G9qQ== X-MS-TrafficTypeDiagnostic: DM6NAM12HT022: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cLJ6ALoYxdHqyjOW92OsrT2ms43iel8eWEZSxRHBqRgzWbufWO9mGozDHXFS0jg29qZCHz5UaI50FX4CE2TXz4uRYbP/G3kMvxni/E5SpLOwZQovBgargbUbtJ9991m0ZSaN6iG2WIuGD0Nlg/aElnM9ObWY2gDjnERTYINrR8MscPBppQmWSxMhZd5B2WEmwsOy8BGB2UXsRMV6YqKnWg== X-MS-Exchange-AntiSpam-MessageData: EiU4keiHFN2FOkY5s1A7DE5RVYJlibOg/oUOPp0HCPyvtdFDpp56njUCJoQEIJ6rkJHhYZADMqZv/NTt0+KMjgRhxNeaN4UKoJaNc0tPzmhfxTB3qoXU39mCyqPugcWEcbcZ+FLR8fanMmu1OCh1MA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57c66c0b-0fb9-4f1a-3107-08d89563e349 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2020 19:12:32.2519 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT008.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: DM6NAM12HT022 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)[phase][build]: Update arm-none-eabi C++ header locations --- gnu/packages/axoloti.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 2a5cf8e0fc..580e18e894 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -142,13 +142,23 @@ ;; 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) + (c-headers + (string-append + toolchain + "/arm-none-eabi/include:" + toolchain + "/arm-none-eabi/include/arm-none-eabi/armv7e-m")) + (c++-headers + (string-append + toolchain + "/arm-none-eabi/include/c++:" + toolchain + "/arm-none-eabi/include/c++/arm-none-eabi:" + toolchain + "/arm-none-eabi/include/arm-none-eabi/c++/arm-none-eabi/armv7e-m:" + c-headers))) + (setenv "CROSS_CPATH" c-headers) + (setenv "CROSS_CPLUS_INCLUDE_PATH" c++-headers) (setenv "CROSS_LIBRARY_PATH" (string-append toolchain "/arm-none-eabi/lib")))