Message ID | SN4PR0801MB36792B73BB3B7610CAFC3B50C5FF0@SN4PR0801MB3679.namprd08.prod.outlook.com |
---|---|
State | Accepted |
Headers | show |
Series | [bug#44750] gnu: gcc-arm-none-eabi: Fix C++ header location | expand |
Context | Check | Description |
---|---|---|
cbaines/submitting builds | success | |
cbaines/submitting builds | success | |
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
So I had previously only tested this when it was in my profile. I decided to check if other packages that depend on this worked. I determined that the following packages depend on arm-none-eabi: axoloti-runtime, axoloti-patcher, axoloti-patcher-next, arm-trusted-firmware-rk3399, rk3399-cortex-m0, raspi-arm-chainloader. With these two patches, everything builds for me except raspi-arm-chainloader but according to this, that package never built: https://data.guix.gnu.org/repository/1/branch/master/package/raspi-arm-chainloader/output-history
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index d6f487bd17..1af266e8cd 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> +;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -143,7 +144,7 @@ (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include"))) + (files '("arm-none-eabi/include/c++"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -313,7 +314,7 @@ 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/c++"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -376,7 +377,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)
From: Morgan Smith <Morgan.J.Smith@outlook.com> * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9)[native-search-paths]: Change C++ header location to include/c++ * gnu/packages/embedded.scm (gcc-arm-none-eabi-7-2018-q2-update)[native-search-paths]: Change C++ header location to include/c++ * gnu/packages/embedded.scm (make-libstdc++-arm-none-eabi)[arguments]: Change C++ header install location to include/c++ Previously the headers where installed in the include folder, overwriting the C headers that where there previously --- gnu/packages/embedded.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)