diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-10-08 19:24:34 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-08 19:24:34 +0200 |
commit | d1f3b333e6176a7879ab3742bbebb2a99f61a528 (patch) | |
tree | 8bd82ce68bd2534a48bf13c7256997f82dd1b3f4 /gnu/packages/avr.scm | |
parent | e01d384efcdaf564bbb221e43b81e087c8e2af06 (diff) | |
parent | 861907f01efb1cae7f260e8cb7b991d5034a486a (diff) | |
download | guix-patches-d1f3b333e6176a7879ab3742bbebb2a99f61a528.tar guix-patches-d1f3b333e6176a7879ab3742bbebb2a99f61a528.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/avr.scm')
-rw-r--r-- | gnu/packages/avr.scm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index eaa3c7d046..1f99f636e0 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -67,7 +67,10 @@ (files '("avr/include"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") - (files '("avr/lib")))))))) + (files '("avr/lib"))))) + (native-inputs + `(("gcc" ,gcc-5) + ,@(package-native-inputs xgcc)))))) (define-public avr-gcc-5 (package @@ -94,11 +97,12 @@ (modify-phases %standard-phases (add-before 'unpack 'fix-cpath (lambda _ - ;; C_INCLUDE_PATH poses issues for cross-building, leading to - ;; failures when building avr-libc on 64-bit systems. Simply - ;; unsetting it allows the build to succeed because it doesn't - ;; try to use any of the native system's headers. + ;; C_INCLUDE_PATH and CPATH pose issues for cross-building, + ;; leading to failures when building avr-libc on 64-bit systems. + ;; Simply unsetting them allows the build to succeed because it + ;; doesn't try to use any of the native system's headers. (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPATH") #t))))) (native-inputs `(("avr-binutils" ,avr-binutils) ("avr-gcc" ,avr-gcc))) |