From 82f9b17687073d9d2d1c9a9a70e338e56fb9a7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 4 Jul 2013 13:26:35 +0200
Subject: [PATCH] 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.
---
gnu/packages/cross-base.scm | 3 ---
guix/build-system/gnu.scm | 8 ++++++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index ca8d432d96a..28224a1c403 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -251,9 +251,6 @@ (define xlinux-headers
#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 d074294b4ca..c12a871fd82 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -299,7 +299,9 @@ (define guile-for-build
,@(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 @@ (define guile-for-build
,@(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))
--
GitLab