From fd96ae4a709c5509f2d78af3968d64fe805ad1ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 May 2020 20:37:46 +0200 Subject: [PATCH] gnu: avr-gcc: Fix conflicting GCC headers. Fixes . Reported by Ricardo Wurmus . * gnu/packages/avr.scm (avr-gcc-4.9)[arguments]: Add phase to hide the default GCC from CPLUS_INCLUDE_PATH. [native-inputs]: Distinguish GCC-5. --- gnu/packages/avr.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 608e487b93..f8884bb6cb 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,6 +50,21 @@ (define-public avr-gcc-4.9 (substitute-keyword-arguments (package-arguments xgcc) ((#:phases phases) `(modify-phases ,phases + (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Remove the default compiler from CPLUS_INCLUDE_PATH to + ;; prevent header conflict with the GCC from native-inputs. + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":")) + (format #t + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")) + #t))) ;; Without a working multilib build, the resulting GCC lacks ;; support for nearly every AVR chip. (add-after 'unpack 'fix-genmultilib @@ -78,7 +94,7 @@ (define-public avr-gcc-4.9 (variable "CROSS_LIBRARY_PATH") (files '("avr/lib"))))) (native-inputs - `(("gcc" ,gcc-5) + `(("gcc@5" ,gcc-5) ,@(package-native-inputs xgcc)))))) (define-public avr-gcc-5