diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-02 23:49:10 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-02 23:49:10 +0100 |
| commit | fb98351621a6b311d4ff9593d6c22d40a3b3fe8f (patch) | |
| tree | 05fb46c92657a70cad6923c64b63540a88555bb4 /gnu/packages/avr.scm | |
| parent | d614f0bba90c86c836131eea3ebb9cbd30f19abf (diff) | |
| parent | 15a6805751309452616999933492f1fb9da8bcec (diff) | |
| download | guix-fb98351621a6b311d4ff9593d6c22d40a3b3fe8f.tar guix-fb98351621a6b311d4ff9593d6c22d40a3b3fe8f.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/avr.scm')
| -rw-r--r-- | gnu/packages/avr.scm | 16 |
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 |