ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcc-arm-none-eabi: Fix C++ header location.

Browse source 
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>
This commit is contained in:
Morgan Smith 2021-04-07 15:09:46 -04:00 committed by Efraim Flashner
parent 83991a34d5
commit 5c9954490c
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/embedded.scm
View file

@ -147,7 +147,9 @@ (define-public gcc-arm-none-eabi-4.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 @@ (define-public gcc-arm-none-eabi-7-2018-q2-update
(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 @@ (define (make-libstdc++-arm-none-eabi xgcc newlib)
"--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)