Subject: [bug#44750] [PATCH v3 2/2] gnu: axoloti-runtime: Update C++ header location

From: [email-masked]
Date: Mon, 30 Nov 2020 14:09:20 -0500

From: Morgan Smith <[email-masked]>

* 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