aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Smith <Morgan.J.Smith@outlook.com>2021-04-07 15:09:46 -0400
committerEfraim Flashner <efraim@flashner.co.il>2021-04-08 10:58:54 +0300
commit5c9954490c81ad824900909c679900ca8ce188af (patch)
tree8c4ca891b4cf837747e43994e4065c456946952e
parent83991a34d5c1d4985e54dd029a81412277ad062a (diff)
downloadguix-5c9954490c81ad824900909c679900ca8ce188af.tar
guix-5c9954490c81ad824900909c679900ca8ce188af.tar.gz
gnu: gcc-arm-none-eabi: Fix C++ header location.
Previously the C++ headers where installed in the include folder, overwriting some C headers. * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9) [native-search-paths]: Add C++ header locations. (gcc-arm-none-eabi-7-2018-q2-update)[native-search-paths]: Add C++ header locations. (make-libstdc++-arm-none-eabi)[arguments]: Change C++ header install location to include/c++. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
-rw-r--r--gnu/packages/embedded.scm10
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 413760ab72..a3f1d85580 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -147,7 +147,9 @@
(files '("arm-none-eabi/include")))
(search-path-specification
(variable "CROSS_CPLUS_INCLUDE_PATH")
- (files '("arm-none-eabi/include")))
+ (files '("arm-none-eabi/include"
+ "arm-none-eabi/include/c++"
+ "arm-none-eabi/include/c++/arm-none-eabi")))
(search-path-specification
(variable "CROSS_LIBRARY_PATH")
(files '("arm-none-eabi/lib"))))))))
@@ -317,7 +319,9 @@ usable on embedded products.")
(files '("arm-none-eabi/include")))
(search-path-specification
(variable "CROSS_CPLUS_INCLUDE_PATH")
- (files '("arm-none-eabi/include")))
+ (files '("arm-none-eabi/include"
+ "arm-none-eabi/include/c++"
+ "arm-none-eabi/include/c++/arm-none-eabi")))
(search-path-specification
(variable "CROSS_LIBRARY_PATH")
(files '("arm-none-eabi/lib"))))))))
@@ -380,7 +384,7 @@ usable on embedded products.")
"--with-newlib"
,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out")
- "/arm-none-eabi/include")))))
+ "/arm-none-eabi/include/c++")))))
(native-inputs
`(("newlib" ,newlib)
("xgcc" ,xgcc)