me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2013-07-04 13:26:35 +02:00
parent a4627d498a
commit 82f9b17687
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/cross-base.scm
View File

@ -251,9 +251,6 @@ XBINUTILS and the cross tool chain."
#t)) #t))
,phases)))) ,phases))))
;; Remove the "debug" output since stripping is disabled.
(outputs (delete "debug" (package-outputs glibc)))
(propagated-inputs `(("cross-linux-headers" ,xlinux-headers))) (propagated-inputs `(("cross-linux-headers" ,xlinux-headers)))
(native-inputs `(("cross-gcc" ,xgcc) (native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils) ("cross-binutils" ,xbinutils)

8
guix/build-system/gnu.scm
View File

@ -299,7 +299,9 @@ which could lead to gratuitous input divergence."
,@(if implicit-inputs? ,@(if implicit-inputs?
implicit-inputs implicit-inputs
'())) '()))
#:outputs outputs #:outputs (if strip-binaries?
outputs
(delete "debug" outputs))
#:modules imported-modules #:modules imported-modules
#:guile-for-build guile-for-build)) #:guile-for-build guile-for-build))
@ -470,7 +472,9 @@ platform."
,@(if implicit-inputs? ,@(if implicit-inputs?
implicit-host-inputs implicit-host-inputs
'())) '()))
#:outputs outputs #:outputs (if strip-binaries?
outputs
(delete "debug" outputs))
#:modules imported-modules #:modules imported-modules
#:guile-for-build guile-for-build)) #:guile-for-build guile-for-build))