aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2020-04-14 12:02:34 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2020-04-14 12:04:17 +0200
commit6177320d7816f2115bb0f6027cd51c29903fe45e (patch)
tree29fe5645862630af8c75098ee24f4258b1f14624
parentacaeaa0a29014f66350ee11486ad1168e1368960 (diff)
downloadguix-6177320d7816f2115bb0f6027cd51c29903fe45e.tar
guix-6177320d7816f2115bb0f6027cd51c29903fe45e.tar.gz
gnu: xen: Fix build failure.
* gnu/packages/virtualization.scm (xen)[arguments]<#:phases>[set-environment-up]: Use CPATH instead of C_INCLUDE_PATH, CPLUS_INCLUDE_PATH.
-rw-r--r--gnu/packages/virtualization.scm9
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 0fded11f3a..bca3c917b2 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1290,14 +1290,13 @@ 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_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
- (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH"))
+ (setenv "CROSS_CPATH" (getenv "CPATH"))
(setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
(filter-environment! cross?
- '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"
+ '("CROSS_CPATH"
"CROSS_LIBRARY_PATH"))
(filter-environment! (lambda (e) (not (cross? e)))
- '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"
+ '("CPATH"
"LIBRARY_PATH"))
;; Guix tries to be helpful and automatically adds
;; mini-os-git-checkout/include to the include path,
@@ -1306,7 +1305,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc"))
(not
(string-contains e
"mini-os-git-checkout")))
- '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"
+ '("CPATH"
"LIBRARY_PATH"))
(setenv "EFI_VENDOR" "guix")
#t))