me
/
guix
Archived
1
0
Fork 0
Code

gnu: xen: Fix build failure. 

This reverts commit 6177320d78,
obsoleted by <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30756>.
master
Tobias Geerinckx-Rice 2020-11-16 02:51:56 +01:00
parent b91e0a5a14
commit 1a8a6b7c9b
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/virtualization.scm
View File

@ -1901,13 +1901,14 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc"))
new-search-path ":"))) new-search-path ":")))
(setenv env-name new-env-value))) (setenv env-name new-env-value)))
environment-variable-names)) environment-variable-names))
(setenv "CROSS_CPATH" (getenv "CPATH")) (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
(setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH"))
(setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
(filter-environment! cross? (filter-environment! cross?
'("CROSS_CPATH" '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"
"CROSS_LIBRARY_PATH")) "CROSS_LIBRARY_PATH"))
(filter-environment! (lambda (e) (not (cross? e))) (filter-environment! (lambda (e) (not (cross? e)))
'("CPATH" '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"
"LIBRARY_PATH")) "LIBRARY_PATH"))
;; Guix tries to be helpful and automatically adds ;; Guix tries to be helpful and automatically adds
;; mini-os-git-checkout/include to the include path, ;; mini-os-git-checkout/include to the include path,
@ -1916,7 +1917,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc"))
(not (not
(string-contains e (string-contains e
"mini-os-git-checkout"))) "mini-os-git-checkout")))
'("CPATH" '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"
"LIBRARY_PATH")) "LIBRARY_PATH"))
(setenv "EFI_VENDOR" "guix") (setenv "EFI_VENDOR" "guix")
#t)) #t))