diff mbox series

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

Message ID SN4PR0801MB3679E56852CA4452BC421BA2C5F50@SN4PR0801MB3679.namprd08.prod.outlook.com
State Accepted
Headers show
Series [bug#44750,v3,1/2] gnu: gcc-arm-none-eabi: Fix C++ header location | expand

Checks

Context Check Description
cbaines/submitting builds success
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Morgan Smith Nov. 30, 2020, 7:09 p.m. UTC 
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 mbox series

Patch

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")))