[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: build-system/gnu: Gracefully handle dangling symlinks in the 'str
|
From: |
Ludovic Courtès |
|
Subject: |
01/02: build-system/gnu: Gracefully handle dangling symlinks in the 'strip' phase. |
|
Date: |
Mon, 24 Nov 2014 21:47:57 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit f8bcf1935a18e9a728e824030b3ded4fb63638cf
Author: Ludovic Courtès <address@hidden>
Date: Mon Nov 24 22:45:41 2014 +0100
build-system/gnu: Gracefully handle dangling symlinks in the 'strip' phase.
* guix/build/gnu-build-system.scm (strip): Check whether 'file-exists?'
before calling 'elf-file?' and 'ar-file?'. This should fix build
failures in the presence of dangling symlinks, as in
<http://hydra.gnu.org/build/167521/nixlog/1/raw>.
---
guix/build/gnu-build-system.scm | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index dbbb71a..e42a6cc 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -343,7 +343,8 @@ makefiles."
debug-output objcopy-command))
(file-system-fold (const #t)
(lambda (path stat result) ; leaf
- (and (or (elf-file? path) (ar-file? path))
+ (and (file-exists? path) ;discard dangling symlinks
+ (or (elf-file? path) (ar-file? path))
(or (not debug-output)
(make-debug-file path))
(zero? (apply system* strip-command