nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gcc: Add "debug" output, debugging symbols of libraries. 

* gnu/packages/gcc.scm (gcc-4.7)[install-target]: Remove.
  [outputs]: Add "debug".
  [arguments]: Remove #:strip-binaries?.  Remove 'install' phase.
This commit is contained in:
Ludovic Courtès 2015-06-09 21:51:18 +02:00
parent 811974925d
commit 9063ef0f79
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/gcc.scm
View File

@ -64,15 +64,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
'()))) '())))
(define-public gcc-4.7 (define-public gcc-4.7
(let* ((stripped? #t) ; TODO: make this a parameter (let* ((stripped? #t) ;whether to strip the compiler, not the libraries
(install-target
(lambda ()
;; The 'install-strip' rule uses the native 'strip' instead of
;; 'TARGET-strip' when cross-compiling. Thus, use 'install' in that
;; case.
(if (and stripped? (not (%current-target-system)))
"install-strip"
"install")))
(maybe-target-tools (maybe-target-tools
(lambda () (lambda ()
;; Return the `_FOR_TARGET' variables that are needed when ;; Return the `_FOR_TARGET' variables that are needed when
@ -144,8 +136,9 @@ where the OS part is overloaded to denote a specific ABI---into GCC
;; Separate out the run-time support libraries because all the ;; Separate out the run-time support libraries because all the
;; dynamic-linked objects depend on it. ;; dynamic-linked objects depend on it.
(outputs '("out" ; commands, etc. (60+ MiB) (outputs '("out" ;commands, etc. (60+ MiB)
"lib")) ; libgcc_s, libgomp, etc. (15+ MiB) "lib" ;libgcc_s, libgomp, etc. (15+ MiB)
"debug")) ;debug symbols of run-time libraries
(inputs `(("gmp" ,gmp) (inputs `(("gmp" ,gmp)
("mpfr" ,mpfr) ("mpfr" ,mpfr)
@ -160,7 +153,6 @@ where the OS part is overloaded to denote a specific ABI---into GCC
(arguments (arguments
`(#:out-of-source? #t `(#:out-of-source? #t
#:strip-binaries? ,stripped?
#:configure-flags ,(configure-flags) #:configure-flags ,(configure-flags)
#:make-flags #:make-flags
;; None of the flags below are needed when doing a Canadian cross. ;; None of the flags below are needed when doing a Canadian cross.
@ -280,11 +272,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
(substitute* "Makefile" (substitute* "Makefile"
(("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest) (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
"TOPLEVEL_CONFIGURE_ARGUMENTS=\n"))) "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))
(alist-replace 'install %standard-phases))))
(lambda* (#:key outputs #:allow-other-keys)
(zero?
(system* "make" ,(install-target))))
%standard-phases)))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification