diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-05-15 22:22:03 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-05-17 15:16:48 +0200 |
| commit | 3d028f03c8cc258fa74b87f15a80b7b2b7da28ec (patch) | |
| tree | 107cb8396571f5643662f0055270c8f47677cae3 | |
| parent | 8d408d5ae4af4c90eee7ff241639aed00b03f887 (diff) | |
| download | guix-3d028f03c8cc258fa74b87f15a80b7b2b7da28ec.tar.gz guix-3d028f03c8cc258fa74b87f15a80b7b2b7da28ec.zip | |
utils: 'target-arm32?' & co. take an optional parameter.
* guix/utils.scm (target-arm32?, target-aarch64?)
(target-arm?, target-64bit?): Make 'target' an optional parameter.
| -rw-r--r-- | guix/utils.scm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/guix/utils.scm b/guix/utils.scm index 3e8e59b8dc..d7b197fa44 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -490,18 +490,21 @@ a character other than '@'." (and target (string-suffix? "-mingw32" target))) -(define (target-arm32?) - (string-prefix? "arm" (or (%current-target-system) (%current-system)))) +(define* (target-arm32? #:optional (target (or (%current-target-system) + (%current-system)))) + (string-prefix? "arm" target)) -(define (target-aarch64?) - (string-prefix? "aarch64" (or (%current-target-system) (%current-system)))) +(define* (target-aarch64? #:optional (target (or (%current-target-system) + (%current-system)))) + (string-prefix? "aarch64" target)) -(define (target-arm?) - (or (target-arm32?) (target-aarch64?))) +(define* (target-arm? #:optional (target (or (%current-target-system) + (%current-system)))) + (or (target-arm32? target) (target-aarch64? target))) -(define (target-64bit?) - (let ((system (or (%current-target-system) (%current-system)))) - (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64")))) +(define* (target-64bit? #:optional (system (or (%current-target-system) + (%current-system)))) + (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64"))) (define version-compare (let ((strverscmp |