* [bug#44750] [PATCH v3 1/2] gnu: gcc-arm-none-eabi: Fix C++ header location [not found] <20201130190917.2689-1-Morgan.J.Smith@outlook.com> @ 2020-11-30 19:09 ` Morgan.J.Smith 2020-11-30 19:09 ` [bug#44750] [PATCH v3 2/2] gnu: axoloti-runtime: Update " Morgan.J.Smith 1 sibling, 0 replies; 2+ messages in thread From: Morgan.J.Smith @ 2020-11-30 19:09 UTC (permalink / raw) To: 44750; +Cc: Morgan Smith From: Morgan Smith <Morgan.J.Smith@outlook.com> * 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 <clement@lassieur.org> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> +;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; ;;; 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) -- 2.29.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#44750] [PATCH v3 2/2] gnu: axoloti-runtime: Update C++ header location [not found] <20201130190917.2689-1-Morgan.J.Smith@outlook.com> 2020-11-30 19:09 ` [bug#44750] [PATCH v3 1/2] gnu: gcc-arm-none-eabi: Fix C++ header location Morgan.J.Smith @ 2020-11-30 19:09 ` Morgan.J.Smith 1 sibling, 0 replies; 2+ messages in thread From: Morgan.J.Smith @ 2020-11-30 19:09 UTC (permalink / raw) To: 44750; +Cc: Morgan Smith From: Morgan Smith <Morgan.J.Smith@outlook.com> * 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"))) -- 2.29.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-30 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20201130190917.2689-1-Morgan.J.Smith@outlook.com>
2020-11-30 19:09 ` [bug#44750] [PATCH v3 1/2] gnu: gcc-arm-none-eabi: Fix C++ header location Morgan.J.Smith
2020-11-30 19:09 ` [bug#44750] [PATCH v3 2/2] gnu: axoloti-runtime: Update " Morgan.J.Smith
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).