summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2020-03-01 12:52:43 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2020-03-01 12:52:43 +0100
commit2f3515f7369d91d8922620044f9348cc727b6c10 (patch)
treef139ac5c8cf20a4f302f52d7df56e6abd294dea3
parentdad3645b67c74b44d7b2e5736fb412eb33f519d4 (diff)
gnu: avr-gcc: Fix compiler lookup paths.
* gnu/packages/avr.scm (avr-gcc-4.9): Use CROSS_C*_INCLUDE_PATH (like cross-base does). (avr-gcc-5)[source]: Apply patch "gcc-cross-environment-variables.patch".
-rw-r--r--gnu/packages/avr.scm16
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index 1f99f636e0..608e487b93 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -63,7 +63,16 @@
`(delete "--disable-multilib" ,flags))))
(native-search-paths
(list (search-path-specification
- (variable "CROSS_CPATH")
+ (variable "CROSS_C_INCLUDE_PATH")
+ (files '("avr/include")))
+ (search-path-specification
+ (variable "CROSS_CPLUS_INCLUDE_PATH")
+ (files '("avr/include")))
+ (search-path-specification
+ (variable "CROSS_OBJC_INCLUDE_PATH")
+ (files '("avr/include")))
+ (search-path-specification
+ (variable "CROSS_OBJCPLUS_INCLUDE_PATH")
(files '("avr/include")))
(search-path-specification
(variable "CROSS_LIBRARY_PATH")
@@ -76,7 +85,10 @@
(package
(inherit avr-gcc-4.9)
(version (package-version gcc-5))
- (source (package-source gcc-5))))
+ (source (origin
+ (inherit (package-source gcc-5))
+ (patches (append (origin-patches (package-source gcc-5))
+ (search-patches "gcc-cross-environment-variables.patch")))))))
(define (avr-libc avr-gcc)
(package