07/08: gnu: xen: Fix build failure.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 1a8a6b7c9bb59700f9660d46ef2a2730551f0412
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Mon Nov 16 02:51:56 2020 +0100

    gnu: xen: Fix build failure.
    
    This reverts commit 6177320d7816f2115bb0f6027cd51c29903fe45e,
    obsoleted by <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30756>.
---
 gnu/packages/virtualization.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index ae90326..1b21aac 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))