all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#44750] [PATCH] gnu: gcc-arm-none-eabi: Fix C++ header location
@ 2020-11-20  1:16 Morgan.J.Smith
  2020-11-30 17:04 ` [bug#44750] [PATCH v2] " Morgan.J.Smith
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Morgan.J.Smith @ 2020-11-20  1:16 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]:
Change C++ header location to include/c++

* gnu/packages/embedded.scm (gcc-arm-none-eabi-7-2018-q2-update)[native-search-paths]:
Change C++ header location to include/c++

* gnu/packages/embedded.scm (make-libstdc++-arm-none-eabi)[arguments]: Change
C++ header install location to include/c++

Previously the headers where installed in the include folder, overwriting the
C headers that where there previously
---
 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..1af266e8cd 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,7 @@
               (files '("arm-none-eabi/include")))
              (search-path-specification
               (variable "CROSS_CPLUS_INCLUDE_PATH")
-              (files '("arm-none-eabi/include")))
+              (files '("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/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





^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-04-08  8:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-20  1:16 [bug#44750] [PATCH] gnu: gcc-arm-none-eabi: Fix C++ header location Morgan.J.Smith
2020-11-30 17:04 ` [bug#44750] [PATCH v2] " Morgan.J.Smith
2020-11-30 19:09 ` [bug#44750] I've done more testing Morgan.J.Smith
2021-04-07 18:14 ` [bug#44750] [PATCH v4] gnu: axoloti-runtime: Simplify build Morgan.J.Smith
2021-04-07 19:09 ` [bug#44750] [PATCH v5 1/2] gnu: gcc-arm-none-eabi: Fix C++ header location Morgan.J.Smith
2021-04-08  8:12   ` bug#44750: " Efraim Flashner

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.