summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorRutherther <rutherther@protonmail.com>2024-09-13 11:41:57 +0000
committerLudovic Courtès <ludo@gnu.org>2024-10-12 19:23:29 +0200
commitce8872fe9dbce401fef140d0f3e8feea85d9570b (patch)
tree32bb06bc5094f32a3bb2e78776a227a1cdabe74a /gnu
parentd8da518c56dd2719859965e0468fdb8e78637d27 (diff)
downloadguix-ce8872fe9dbce401fef140d0f3e8feea85d9570b.tar.gz
gnu: make-gcc-arm-none-eabi: reorder C++ native search paths
This fixes native-search-paths of arm-none-eabi toolchains
The toolchains CROSS_CPLUS_INCLUDE_PATH had C include directory
first, and the C++ as second. Since <cstdlib> does #include_next <stdlib.h>,
the toolchains could not build anything using <cstdlib>. The C include
has to come later than C++ one. This is already fixed in xgcc search-path.

* gnu/packages/embedded.scm (make-gcc-arm-none-eabi-4.9,
make-gcc-arm-none-eabi-7-2018-q2-update): [native-search-paths]: Put C include
path as last.

Change-Id: Ib7e36e57e510ac87960375cad40ff0b9e749101c
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/embedded.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index bee65663b6..a7ba9ebe98 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -201,9 +201,9 @@ embedded-4_9-branch/")
                 (files '("arm-none-eabi/include")))
                (search-path-specification
                 (variable "CROSS_CPLUS_INCLUDE_PATH")
-                (files '("arm-none-eabi/include"
-                         "arm-none-eabi/include/c++"
-                         "arm-none-eabi/include/c++/arm-none-eabi")))
+                (files '("arm-none-eabi/include/c++"
+                         "arm-none-eabi/include/c++/arm-none-eabi"
+                         "arm-none-eabi/include")))
                (search-path-specification
                 (variable "CROSS_LIBRARY_PATH")
                 (files '("arm-none-eabi/lib")))))))))
@@ -423,9 +423,9 @@ embedded-7-branch/")
                        (files '("arm-none-eabi/include")))
                       (search-path-specification
                        (variable "CROSS_CPLUS_INCLUDE_PATH")
-                       (files '("arm-none-eabi/include"
-                                "arm-none-eabi/include/c++"
-                                "arm-none-eabi/include/c++/arm-none-eabi")))
+                       (files '("arm-none-eabi/include/c++"
+                                "arm-none-eabi/include/c++/arm-none-eabi"
+                                "arm-none-eabi/include")))
                       (search-path-specification
                        (variable "CROSS_LIBRARY_PATH")
                        (files '("arm-none-eabi/lib")))))))))