diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-12-19 10:52:50 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-12-19 16:27:13 +0200 |
| commit | 7a7ba2d07573c1c4ed6be63c615727ad22f4caac (patch) | |
| tree | 97243ae0d8087df162420e7530be1ea1c3c0e2dd | |
| parent | edb794bbd45a3e290c678d3f50863278b8f09799 (diff) | |
| download | guix-7a7ba2d07573c1c4ed6be63c615727ad22f4caac.tar.gz | |
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
| -rw-r--r-- | gnu/packages/firmware.scm | 12 |
1 files changed, 0 insertions, 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) |