diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /guix/utils.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'guix/utils.scm')
| -rw-r--r-- | guix/utils.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/utils.scm b/guix/utils.scm index 9596ff8582..cba6464523 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -668,7 +668,7 @@ a character other than '@'." "Is the architecture of TARGET a variant of Intel's 32-bit architecture (IA32)?" ;; Intel also has a 16-bit architecture in the iN86 series, i286 - ;; (see, e.g. https://en.wikipedia.org/wiki/Intel/808286) so this + ;; (see, e.g., https://en.wikipedia.org/wiki/Intel_80286) so this ;; procedure is not named target-x86?. (or (string-prefix? "i386-" target) (string-prefix? "i486-" target) @@ -712,7 +712,8 @@ architecture (x86_64)?" (define* (target-64bit? #:optional (system (or (%current-target-system) (%current-system)))) - (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "powerpc64"))) + (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" + "powerpc64" "riscv64"))) (define* (cc-for-target #:optional (target (%current-target-system))) (if target |