aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-03-30 11:31:50 +0100
committerLudovic Courtès <ludo@gnu.org>2013-03-30 21:46:59 +0100
commita96748bb46c6da65c7d66cb6d4f0d6f19febda27 (patch)
treea96cfc8b945925743dc73c2cce63b817dff45c25
parent4928e50033615e1d130dd84f131eff4cbc702ccf (diff)
downloadpatches-a96748bb46c6da65c7d66cb6d4f0d6f19febda27.tar
patches-a96748bb46c6da65c7d66cb6d4f0d6f19febda27.tar.gz
build-system/gnu: Remove #:path-exclusions parameter.
* guix/build/gnu-build-system.scm (set-paths): Remove `path-exclusions' parameter. Replace `relevant-input-directories' by `input-directories'. * guix/build-system/gnu.scm (gnu-build): Remove `path-exclusions' parameter; don't pass it in BUILDER. * guix/build-system/cmake.scm (cmake-build): Likewise.
-rw-r--r--guix/build-system/cmake.scm2
-rw-r--r--guix/build-system/gnu.scm2
-rw-r--r--guix/build/gnu-build-system.scm26
3 files changed, 9 insertions, 21 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 2a9db80cf8..9794f4d057 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -42,7 +42,6 @@
(patches ''()) (patch-flags ''("--batch" "-p1"))
(cmake (@ (gnu packages cmake) cmake))
(out-of-source? #f)
- (path-exclusions ''())
(tests? #t)
(test-target "test")
(parallel-build? #t) (parallel-tests? #f)
@@ -77,7 +76,6 @@ provides a 'CMakeLists.txt' file as its build system."
#:configure-flags ,configure-flags
#:make-flags ,make-flags
#:out-of-source? ,out-of-source?
- #:path-exclusions ,path-exclusions
#:tests? ,tests?
#:test-target ,test-target
#:parallel-build? ,parallel-build?
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 8049e7510f..f4d0fa4f7c 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -163,7 +163,6 @@ System: GCC, GNU Make, Bash, Coreutils, etc."
(make-flags ''())
(patches ''()) (patch-flags ''("--batch" "-p1"))
(out-of-source? #f)
- (path-exclusions ''())
(tests? #t)
(test-target "check")
(parallel-build? #t) (parallel-tests? #t)
@@ -205,7 +204,6 @@ which could lead to gratuitous input divergence."
#:configure-flags ,configure-flags
#:make-flags ,make-flags
#:out-of-source? ,out-of-source?
- #:path-exclusions ,path-exclusions
#:tests? ,tests?
#:test-target ,test-target
#:parallel-build? ,parallel-build?
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 8fc6f86507..891c30df8f 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -48,34 +48,26 @@
#f
dir))
-(define* (set-paths #:key inputs (path-exclusions '())
+(define* (set-paths #:key inputs
#:allow-other-keys)
- (define (relevant-input-directories env-var)
- ;; Return the subset of INPUTS that should be considered when setting
- ;; ENV-VAR.
- (match (assoc-ref path-exclusions env-var)
- (#f
- (map cdr inputs))
- ((excluded ...)
- (filter-map (match-lambda
- ((name . dir)
- (and (not (member name excluded))
- dir)))
- inputs))))
+ (define input-directories
+ (match inputs
+ (((_ . dir) ...)
+ dir)))
(set-path-environment-variable "PATH" '("bin")
- (relevant-input-directories "PATH"))
+ input-directories)
(set-path-environment-variable "CPATH" '("include")
- (relevant-input-directories "CPATH"))
+ input-directories)
(set-path-environment-variable "LIBRARY_PATH" '("lib" "lib64")
- (relevant-input-directories "LIBRARY_PATH"))
+ input-directories)
;; FIXME: Eventually move this to the `search-paths' field of the
;; `pkg-config' package.
(set-path-environment-variable "PKG_CONFIG_PATH"
'("lib/pkgconfig" "lib64/pkgconfig"
"share/pkgconfig")
- (relevant-input-directories "PKG_CONFIG_PATH"))
+ input-directories)
;; Dump the environment variables as a shell script, for handy debugging.
(system "export > environment-variables"))