diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-16 06:04:38 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-16 06:44:09 -0400 |
| commit | e9b23fe8bd7c78da1b7b1ed8fd86830260fdbb20 (patch) | |
| tree | 69d03fc3daf7742b333aad80587f998bc6390511 | |
| parent | 5732008757206827cb3d8fa65fa47d9c3f9f0c81 (diff) | |
| download | guix-e9b23fe8bd7c78da1b7b1ed8fd86830260fdbb20.tar guix-e9b23fe8bd7c78da1b7b1ed8fd86830260fdbb20.tar.gz | |
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.
| -rw-r--r-- | guix/build/gnu-build-system.scm | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 92d5cb33b7..f49de0e7f1 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -223,7 +223,8 @@ $CONFIG_SHELL, but some don't, such as `mkinstalldirs' or Automake's (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 @@ makefiles." #: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 @@ makefiles." (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 @@ phase after stripping." (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) |