diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-06-05 16:39:58 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-05 16:39:58 +0200 |
| commit | a3e69bb892a20a2f2fd034dfefc0382236e4981b (patch) | |
| tree | 56bf2feaa36c628eb612db5a4188985c7d8f3472 | |
| parent | a1db0975350916c015cf6df27881f53ebb1575fc (diff) | |
| download | gnu-guix-a3e69bb892a20a2f2fd034dfefc0382236e4981b.tar gnu-guix-a3e69bb892a20a2f2fd034dfefc0382236e4981b.tar.gz | |
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).
| -rw-r--r-- | guix/build-system/gnu.scm | 27 |
1 files changed, 13 insertions, 14 deletions
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 |