aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-07-04 13:26:35 +0200
committerLudovic Courtès <ludo@gnu.org>2013-07-04 13:26:35 +0200
commit82f9b17687073d9d2d1c9a9a70e338e56fb9a7b7 (patch)
tree4a0bfd94fff08e9e8745a9e1618258d67a391885
parenta4627d498a9d8021141df27a1cac4c61da8a7a59 (diff)
downloadguix-82f9b17687073d9d2d1c9a9a70e338e56fb9a7b7.tar
guix-82f9b17687073d9d2d1c9a9a70e338e56fb9a7b7.tar.gz
build-system/gnu: Remove the "debug" output when `strip-binaries?' is #f.
* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Delete "debug" from OUTPUTS when STRIP-BINARIES? is false. * gnu/packages/cross-base.scm (cross-libc): Leave `outputs' unchanged. This reverts commit a4627d4.
-rw-r--r--gnu/packages/cross-base.scm3
-rw-r--r--guix/build-system/gnu.scm8
2 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index ca8d432d96..28224a1c40 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -251,9 +251,6 @@ XBINUTILS and the cross tool chain."
#t))
,phases))))
- ;; Remove the "debug" output since stripping is disabled.
- (outputs (delete "debug" (package-outputs glibc)))
-
(propagated-inputs `(("cross-linux-headers" ,xlinux-headers)))
(native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index d074294b4c..c12a871fd8 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -299,7 +299,9 @@ which could lead to gratuitous input divergence."
,@(if implicit-inputs?
implicit-inputs
'()))
- #:outputs outputs
+ #:outputs (if strip-binaries?
+ outputs
+ (delete "debug" outputs))
#:modules imported-modules
#:guile-for-build guile-for-build))
@@ -470,7 +472,9 @@ platform."
,@(if implicit-inputs?
implicit-host-inputs
'()))
- #:outputs outputs
+ #:outputs (if strip-binaries?
+ outputs
+ (delete "debug" outputs))
#:modules imported-modules
#:guile-for-build guile-for-build))