efraim pushed a commit to branch master
in repository guix.
commit 7a7ba2d07573c1c4ed6be63c615727ad22f4caac
Author: Efraim Flashner <[email protected]>
AuthorDate: Tue Dec 19 10:52:50 2023 +0200
gnu: ovmf: Build with newer gcc.
* gnu/packages/firmware.scm (ovmf)[arguments]: Remove 'hide-implicit-gcc
phase.
[native-inputs]: Remove gcc-5.
Change-Id: I2bcaea77019bb69214878713aa57cbef49c473db
---
gnu/packages/firmware.scm | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 5a67095235..222eec07e8 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -893,17 +893,6 @@ Executables included are:
#: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-implicit-gcc
- (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")
- #\:))
- ":")))))
(add-after 'unpack 'patch-source
(lambda _
(substitute* "edksetup.sh"
@@ -969,7 +958,6 @@ Executables included are:
"OVMF_VARS"))))))))
(native-inputs
`(("acpica" ,acpica)
- ("gcc@5" ,gcc-5)
("nasm" ,nasm)
("perl" ,perl)
("python-3" ,python-3)
