diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 19:01:41 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 19:01:41 +0100 |
| commit | 5d446d6b6a196a7838b9102172cffcc3ebd18487 (patch) | |
| tree | 2b6915756d14e8ea9b46e7652819c20f037d9134 /gnu/packages/firmware.scm | |
| parent | a3efa4f9eb11b8dc08ab154931ef2a2ef14c0ab7 (diff) | |
| download | guix-patches-5d446d6b6a196a7838b9102172cffcc3ebd18487.tar guix-patches-5d446d6b6a196a7838b9102172cffcc3ebd18487.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/firmware.scm')
| -rw-r--r-- | gnu/packages/firmware.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 93f01b9719..2dff39f786 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)) |