futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build-system/gnu: 'strip' phase now skips symlinks.

Browse Source 
This avoids a situation where the "debug" output would contain separate
(and different) .debug files for "libfoo.so" and "libfoo.so.0.0", even
though "libfoo.so" is actually a symlink to "libfoo.so.0.0".

* guix/build/gnu-build-system.scm (strip): Remove 'file-exists?' call in
'for-each' lambda.  Pass a predicate to 'find-files' to restrict the
result to regular files.
This commit is contained in:
Ludovic Courtès 2017-01-26 11:27:11 +01:00
parent 9b9e147117
commit 0363474a0b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -389,8 +389,7 @@ makefiles."
debug-output objcopy-command))
(for-each (lambda (file)
(and (file-exists? file) ;discard dangling symlinks
(or (elf-file? file) (ar-file? file))
(and (or (elf-file? file) (ar-file? file))
(or (not debug-output)
(make-debug-file file))
;; Ensure libraries are writable.
@ -399,7 +398,12 @@ makefiles."
(append strip-flags (list file))))
(or (not debug-output)
(add-debug-link file))))
(find-files dir)))
(find-files dir
(lambda (file stat)
;; Ignore symlinks such as:
;; libfoo.so -> libfoo.so.0.0.
(eq? 'regular (stat:type stat)))
#:stat lstat)))
(or (not strip-binaries?)
(every strip-dir