summaryrefslogtreecommitdiff
path: root/gnu/packages/cross-base.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-01-05 13:58:36 +0100
committerLudovic Courtès <ludo@gnu.org>2016-01-05 14:11:54 +0100
commite8e2e18b84eb8842a59be9bf7d49bb672260ae3a (patch)
treef5b237e29d64ad6a2962af0251a39929e4a4d09c /gnu/packages/cross-base.scm
parenta2ab82db9ab5d6db86762924d3016aed7c26c315 (diff)
gnu: Read 'C_INCLUDE_PATH' instead of 'CPATH'.
This is a followup to 009b53fd. * gnu/packages/cmake.scm (cmake)[arguments]: Use (getenv "C_INCLUDE_PATH") instead of (getenv "CPATH"). * gnu/packages/package-management.scm (rpm)[arguments]: Likewise. * gnu/packages/video.scm (avidemux)[arguments]: Likewise. * gnu/packages/webkit.scm (webkitgtk)[arguments]: Likewise. * gnu/packages/cross-base.scm (cross-gcc-arguments): Likewise, and unset 'C_INCLUDE_PATH' and 'CPLUS_INCLUDE_PATH'.
Diffstat (limited to 'gnu/packages/cross-base.scm')
-rw-r--r--gnu/packages/cross-base.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index d64cdd1272..cefe2f947f 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
@@ -181,12 +181,14 @@ may be either a libc package or #f.)"
(string-append libc "/lib"))
(let ((cpath (search-path-as-string->list
- (getenv "CPATH")))
+ (getenv "C_INCLUDE_PATH")))
(libpath (search-path-as-string->list
(getenv "LIBRARY_PATH"))))
(setenv "CPATH"
(list->search-path-as-string
(remove cross? cpath) ":"))
+ (for-each unsetenv
+ '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
(setenv "LIBRARY_PATH"
(list->search-path-as-string
(remove cross? libpath) ":"))