civodul pushed a commit to branch master
in repository guix.
commit 3f09b05d8d402d306105ef5ac63f8b6dc49c5e3a
Author: Rutherther <[email protected]>
AuthorDate: Fri Sep 13 11:42:04 2024 +0000
gnu: make-libstdc++-arm-none-eabi: output libstdc++ to arm-none-eabi.
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", that's the path
added to CROSS_C_LIBRARY_PATH
* gnu/packages/embedded.scm (make-libstdc++-arm-none-eabi):
[arguments]<#:configure-flags>: Point --libdir to arm-none-eabi/lib.
[arguments]<#:strip-directories>: Set to arm-none-eabi/lib.
Change-Id: Ia8b867a1c6ebeedeae9564e0a6a1e0401b35bd5b
Signed-off-by: Ludovic Courtès <[email protected]>
---
gnu/packages/embedded.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index a7ba9ebe98..2a482f7e52 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -493,9 +493,14 @@ embedded-7-branch/")
"--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++")))))
+ "/arm-none-eabi/include/c++")))
+ ((#:strip-directories _ #f)
+ ''("arm-none-eabi/lib"))))
(native-inputs
`(("newlib" ,newlib)
("xgcc" ,xgcc)
