02/02: gnu: gcc-arm-none-eabi: Fix conflicting GCC headers.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 7f6d3f395023ff430cf8b7a981d4780698e9d132
Author: Marius Bakke <address@hidden>
AuthorDate: Wed May 13 20:39:01 2020 +0200

    gnu: gcc-arm-none-eabi: Fix conflicting GCC headers.
    
    Fixes <https://bugs.gnu.org/41210>.
    Reported by Ricardo Wurmus <address@hidden>.
    
    * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9)[arguments]: Add phase to
    remove the default compiler from CPLUS_INCLUDE_PATH.
    [native-inputs]: Distinguish GCC-5.
---
 gnu/packages/embedded.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 131a928..b83b67f 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017, 2020 Efraim Flashner <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2018, 2019 Clément Lassieur <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -87,12 +88,27 @@
                           (origin-patches (package-source xgcc))))))
       (native-inputs
        `(("flex" ,flex)
-         ("gcc" ,gcc-5)
+         ("gcc@5" ,gcc-5)
          ,@(package-native-inputs xgcc)))
       (arguments
        (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)))
              (add-after 'unpack 'fix-genmultilib
                (lambda _
                  (substitute* "gcc/genmultilib"