Subject: [PATCH 2/5] Fix lib directory of arm-none-eabi libstdc++

From: Rutherther <[email-masked]>
Date: Sun, 08 Sep 2024 07:49:02 +0000

The libstdc++ made for arm-none-eabi puts the contents
into "lib" folder, but that's unexpected when the resulting
toolchain is a cross toolchain.
The folder should be "arm-none-eabi/lib"
---
 gnu/packages/embedded.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index a7ba9ebe98..59ffd9a661 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -481,6 +481,8 @@ (define make-libstdc++-arm-none-eabi
       (package
         (inherit libstdc++)
         (name "libstdc++-arm-none-eabi")
+        ; TODO When --libdir is specified, debug output is not produced.
+        (outputs '("out"))
         (arguments
          (substitute-keyword-arguments (package-arguments libstdc++)
            ((#:configure-flags _)
@@ -493,6 +495,9 @@ (define make-libstdc++-arm-none-eabi
                "--disable-tls"
                "--disable-plugin"
                "--with-newlib"
+               ,(string-append "--libdir="
+                               (assoc-ref %outputs "out")
+                               "/arm-none-eabi/lib")
                ,(string-append "--with-gxx-include-dir="
                                (assoc-ref %outputs "out")
                                "/arm-none-eabi/include/c++")))))
-- 
2.45.2