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

gnu: Revert use of '--strip-all'. 

This reverts commits f05bdc9412
and 856ae5e6c7.

This broke all sorts of things.  See <http://hydra.gnu.org/eval/102058>,
for example.
This commit is contained in:
Ludovic Courtès 2014-12-29 21:44:48 +01:00
parent f05bdc9412
commit 7da473b757
5 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/base.scm
View File

@ -421,9 +421,6 @@ included.")
;; XXX: Work around "undefined reference to `__stack_chk_guard'". ;; XXX: Work around "undefined reference to `__stack_chk_guard'".
"libc_cv_ssp=no") "libc_cv_ssp=no")
;; Using '--strip-all' on crt*.o breaks them.
#:strip-flags '("--strip-debug")
#:tests? #f ; XXX #:tests? #f ; XXX
#:phases (alist-cons-before #:phases (alist-cons-before
'configure 'pre-configure 'configure 'pre-configure

4
gnu/packages/commencement.scm
View File

@ -170,10 +170,6 @@ identifier SYSTEM."
(ice-9 regex) (ice-9 regex)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)) (srfi srfi-26))
;; Using '--strip-all' leads to a link failure while building libc.
#:strip-flags '("--strip-debug")
,@(substitute-keyword-arguments (package-arguments gcc-4.8) ,@(substitute-keyword-arguments (package-arguments gcc-4.8)
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list ,(string-append "--target=" (boot-triplet)) `(append (list ,(string-append "--target=" (boot-triplet))

5
gnu/packages/linux.scm
View File

@ -292,11 +292,6 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
(alist-replace (alist-replace
'install ,install-phase 'install ,install-phase
(alist-delete 'configure %standard-phases))) (alist-delete 'configure %standard-phases)))
;; Use '--strip-debug', not '--strip-all', because the latter leads to
;; unloadable modules (due to the lack of a symbol table.)
#:strip-flags '("--strip-debug")
#:tests? #f)) #:tests? #f))
(synopsis "100% free redistribution of a cleaned Linux kernel") (synopsis "100% free redistribution of a cleaned Linux kernel")
(description (description

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

@ -274,8 +274,7 @@ standard packages used as implicit inputs of the GNU build system."
(parallel-tests? #t) (parallel-tests? #t)
(patch-shebangs? #t) (patch-shebangs? #t)
(strip-binaries? #t) (strip-binaries? #t)
(strip-flags ''("--strip-all")) (strip-flags ''("--strip-debug"))
(archive-strip-flags ''("--strip-debug"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '%standard-phases) (phases '%standard-phases)
@ -339,7 +338,6 @@ are allowed to refer to."
#:patch-shebangs? ,patch-shebangs? #:patch-shebangs? ,patch-shebangs?
#:strip-binaries? ,strip-binaries? #:strip-binaries? ,strip-binaries?
#:strip-flags ,strip-flags #:strip-flags ,strip-flags
#:archive-strip-flags ,archive-strip-flags
#:strip-directories ,strip-directories))) #:strip-directories ,strip-directories)))
(define guile-for-build (define guile-for-build

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

@ -297,13 +297,7 @@ makefiles."
(objcopy-command (if target (objcopy-command (if target
(string-append target "-objcopy") (string-append target "-objcopy")
"objcopy")) "objcopy"))
(strip-flags '("--strip-all")) (strip-flags '("--strip-debug"))
;; Using '--strip-all' on .a file would remove the archive
;; index, leading to "Archive has no index" errors when
;; linking against them.
(archive-strip-flags '("--strip-debug"))
(strip-directories '("lib" "lib64" "libexec" (strip-directories '("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
#:allow-other-keys) #:allow-other-keys)
@ -359,10 +353,7 @@ makefiles."
(or (not debug-output) (or (not debug-output)
(make-debug-file path)) (make-debug-file path))
(zero? (apply system* strip-command (zero? (apply system* strip-command
(append (if (ar-file? path) (append strip-flags (list path))))
archive-strip-flags
strip-flags)
(list path))))
(or (not debug-output) (or (not debug-output)
(add-debug-link path)))) (add-debug-link path))))
(const #t) ; down (const #t) ; down