01/02: gnu: gcc-arm-none-eabi: Fix C++ header location.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 5c9954490c81ad824900909c679900ca8ce188af
Author: Morgan Smith <Morgan.J.Smith@outlook.com>
AuthorDate: Wed Apr 7 15:09:46 2021 -0400

    gnu: gcc-arm-none-eabi: Fix C++ header location.
    
    Previously the C++ headers where installed in the include folder, 
overwriting
    some C headers.
    
    * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9)
    [native-search-paths]: Add C++ header locations.
    (gcc-arm-none-eabi-7-2018-q2-update)[native-search-paths]: Add C++
    header locations.
    (make-libstdc++-arm-none-eabi)[arguments]: Change C++ header install
    location to include/c++.
    
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 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 413760a..a3f1d85 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -147,7 +147,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 @@ 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"))))))))
@@ -380,7 +384,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)