guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: avr-gcc: Fix conflicting GCC headers.


From: guix-commits
Subject: 01/02: gnu: avr-gcc: Fix conflicting GCC headers.
Date: Wed, 13 May 2020 15:13:43 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit fd96ae4a709c5509f2d78af3968d64fe805ad1ef
Author: Marius Bakke <address@hidden>
AuthorDate: Wed May 13 20:37:46 2020 +0200

    gnu: avr-gcc: Fix conflicting GCC headers.
    
    Fixes <https://bugs.gnu.org/41209>.
    Reported by Ricardo Wurmus <address@hidden>.
    
    * 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 608e487..f8884bb 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016 David Thompson <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -49,6 +50,21 @@
        (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 @@
               (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]