branch core-updates updated: gnu: ovmf: Adapt to CPLUS_INCLUDE_PATH changes.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mbakke pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 5d446d6  gnu: ovmf: Adapt to CPLUS_INCLUDE_PATH changes.
5d446d6 is described below

commit 5d446d6b6a196a7838b9102172cffcc3ebd18487
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Mar 27 19:01:41 2020 +0100

    gnu: ovmf: Adapt to CPLUS_INCLUDE_PATH changes.
    
    * gnu/packages/firmware.scm (ovmf)[native-inputs]: Distinguish GCC-5.
    [arguments]: Add phase to hide the default GCC from CPLUS_INCLUDE_PATH.
---
 gnu/packages/firmware.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 93f01b9..2dff39f 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -320,7 +320,7 @@ coreboot.")
     (build-system gnu-build-system)
     (native-inputs
      `(("acpica" ,acpica)
-       ("gcc" ,gcc-5)
+       ("gcc@5" ,gcc-5)
        ("nasm" ,nasm)
        ("python-2" ,python-2)
        ("util-linux" ,util-linux "lib")))
@@ -328,6 +328,18 @@ coreboot.")
      `(#:tests? #f ; No check target.
        #:phases
        (modify-phases %standard-phases
+         ;; Hide the default GCC from CPLUS_INCLUDE_PATH to prevent it from
+         ;; shadowing the version of GCC provided in native-inputs.
+         (add-after 'set-paths 'hide-gcc7
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((gcc (assoc-ref inputs "gcc")))
+               (setenv "CPLUS_INCLUDE_PATH"
+                       (string-join
+                        (delete (string-append gcc "/include/c++")
+                                (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                              #\:))
+                        ":"))
+               #t)))
          (replace 'configure
            (lambda _
              (let* ((cwd (getcwd))