From a3e69bb892a20a2f2fd034dfefc0382236e4981b Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 5 Jun 2013 16:39:58 +0200
Subject: gnu: Fix `static-package' arguments overriding.
* guix/build-system/gnu.scm (static-package): Call `package-arguments'
from within the `arguments' field, so it see the
right (%current-target-system).
---
guix/build-system/gnu.scm | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
(limited to 'guix')
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 0998e6f21b..35590aa3da 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -116,20 +116,19 @@ flags for VARIABLE, the associated value is augmented."
#:key (strip-all? #t))
"Return a statically-linked version of package P. If STRIP-ALL? is true,
use `--strip-all' as the arguments to `strip'."
- (let ((args (package-arguments p)))
- (package (inherit p)
- (location (source-properties->location loc))
- (arguments
- (let ((a (default-keyword-arguments args
- '(#:configure-flags '()
- #:strip-flags '("--strip-debug")))))
- (substitute-keyword-arguments a
- ((#:configure-flags flags)
- `(cons* "--disable-shared" "LDFLAGS=-static" ,flags))
- ((#:strip-flags flags)
- (if strip-all?
- ''("--strip-all")
- flags))))))))
+ (package (inherit p)
+ (location (source-properties->location loc))
+ (arguments
+ (let ((a (default-keyword-arguments (package-arguments p)
+ '(#:configure-flags '()
+ #:strip-flags '("--strip-debug")))))
+ (substitute-keyword-arguments a
+ ((#:configure-flags flags)
+ `(cons* "--disable-shared" "LDFLAGS=-static" ,flags))
+ ((#:strip-flags flags)
+ (if strip-all?
+ ''("--strip-all")
+ flags)))))))
(define %store
--
cgit v1.2.3