diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-11-16 02:51:56 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-11-16 04:11:46 +0100 |
| commit | 1a8a6b7c9bb59700f9660d46ef2a2730551f0412 (patch) | |
| tree | e42f6791f03d7b4bceeeef7d711dea9a52ba79ed | |
| parent | b91e0a5a14009421f9c6a62f6fc8372bed27faf2 (diff) | |
| download | guix-1a8a6b7c9bb59700f9660d46ef2a2730551f0412.tar guix-1a8a6b7c9bb59700f9660d46ef2a2730551f0412.tar.gz | |
gnu: xen: Fix build failure.
This reverts commit 6177320d7816f2115bb0f6027cd51c29903fe45e,
obsoleted by <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30756>.
| -rw-r--r-- | gnu/packages/virtualization.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index ae903261cc..1b21aac669 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1901,13 +1901,14 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) new-search-path ":"))) (setenv env-name new-env-value))) 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")) (filter-environment! cross? - '("CROSS_CPATH" + '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" "CROSS_LIBRARY_PATH")) (filter-environment! (lambda (e) (not (cross? e))) - '("CPATH" + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" "LIBRARY_PATH")) ;; Guix tries to be helpful and automatically adds ;; 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 (string-contains e "mini-os-git-checkout"))) - '("CPATH" + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" "LIBRARY_PATH")) (setenv "EFI_VENDOR" "guix") #t)) |