build-system/gnu: Return a boolean from all phase procedures.
* guix/build/gnu-build-system.scm (patch-source-shebangs) (patch-generated-file-shebangs, strip): Return #t. (validate-runpath): Raise an exception if validation fails. Never return #f.
This commit is contained in:
parent
5732008757
commit
e9b23fe8bd
|
@ -223,7 +223,8 @@ (define* (patch-source-shebangs #:key source #:allow-other-keys)
|
|||
(lambda (file stat)
|
||||
;; Filter out symlinks.
|
||||
(eq? 'regular (stat:type stat)))
|
||||
#:stat lstat)))
|
||||
#:stat lstat))
|
||||
#t)
|
||||
|
||||
(define (patch-generated-file-shebangs . rest)
|
||||
"Patch shebangs in generated files, including `SHELL' variables in
|
||||
|
@ -238,7 +239,9 @@ (define (patch-generated-file-shebangs . rest)
|
|||
#:stat lstat))
|
||||
|
||||
;; Patch `SHELL' in generated makefiles.
|
||||
(for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$")))
|
||||
(for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$"))
|
||||
|
||||
#t)
|
||||
|
||||
(define* (configure #:key build target native-inputs inputs outputs
|
||||
(configure-flags '()) out-of-source?
|
||||
|
@ -461,7 +464,8 @@ (define (strip-dir dir)
|
|||
(let ((sub (string-append dir "/" d)))
|
||||
(and (directory-exists? sub) sub)))
|
||||
strip-directories)))
|
||||
outputs))))
|
||||
outputs)))
|
||||
#t)
|
||||
|
||||
(define* (validate-runpath #:key
|
||||
(validate-runpath? #t)
|
||||
|
@ -504,10 +508,11 @@ (define (file=? file1 file2)
|
|||
(filter-map (sub-directory output)
|
||||
elf-directories)))
|
||||
outputs)))
|
||||
(every* validate dirs))
|
||||
(begin
|
||||
(format (current-error-port) "skipping RUNPATH validation~%")
|
||||
#t)))
|
||||
(unless (every* validate dirs)
|
||||
(error "RUNPATH validation failed")))
|
||||
(format (current-error-port) "skipping RUNPATH validation~%"))
|
||||
|
||||
#t)
|
||||
|
||||
(define* (validate-documentation-location #:key outputs
|
||||
#:allow-other-keys)
|
||||
|
|
Loading…
Reference in a new issue