amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Fix `static-package' arguments overriding.

Browse source 
* guix/build-system/gnu.scm (static-package): Call `package-arguments'
  from within the `arguments' field, so it see the
  right (%current-target-system).
This commit is contained in:
Ludovic Courtès 2013-06-05 16:39:58 +02:00
parent a1db097535
commit a3e69bb892
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
guix/build-system/gnu.scm
View file

@ -116,20 +116,19 @@ flags for VARIABLE, the associated value is augmented."
#:key (strip-all? #t)) #:key (strip-all? #t))
"Return a statically-linked version of package P. If STRIP-ALL? is true, "Return a statically-linked version of package P. If STRIP-ALL? is true,
use `--strip-all' as the arguments to `strip'." use `--strip-all' as the arguments to `strip'."
(let ((args (package-arguments p))) (package (inherit p)
(package (inherit p) (location (source-properties->location loc))
(location (source-properties->location loc)) (arguments
(arguments (let ((a (default-keyword-arguments (package-arguments p)
(let ((a (default-keyword-arguments args '(#:configure-flags '()
'(#:configure-flags '() #:strip-flags '("--strip-debug")))))
#:strip-flags '("--strip-debug"))))) (substitute-keyword-arguments a
(substitute-keyword-arguments a ((#:configure-flags flags)
((#:configure-flags flags) `(cons* "--disable-shared" "LDFLAGS=-static" ,flags))
`(cons* "--disable-shared" "LDFLAGS=-static" ,flags)) ((#:strip-flags flags)
((#:strip-flags flags) (if strip-all?
(if strip-all? ''("--strip-all")
''("--strip-all") flags)))))))
flags))))))))
(define %store (define %store