From: Christopher Baines <mail@cbaines.net>
To: 70985@debbugs.gnu.org
Subject: [bug#70985] [PATCH v3 4/6] build-system: meson: Use a more specific exception.
Date: Fri, 12 Jul 2024 14:41:43 +0100 [thread overview]
Message-ID: <0739930bf7312cde64a1d4f6268b7d332bfa8f5f.1720791705.git.mail@cbaines.net> (raw)
In-Reply-To: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net>
This is handled by (guix ui).
* guix/build-system/meson.scm (make-machine-alist): Use a more specific
exception.
Change-Id: I842ba63739fdefe04460e938c7bc8aa54ea57b96
---
guix/build-system/meson.scm | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index bf9ca15ecc..04d2241c79 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -30,6 +30,8 @@ (define-module (guix build-system meson)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix packages)
+ #:use-module (srfi srfi-34)
+ #:use-module (srfi srfi-35)
#:export (%meson-build-system-modules
meson-build-system
make-cross-file))
@@ -50,7 +52,12 @@ (define (make-machine-alist triplet)
((target-linux? triplet) "linux")
((target-mingw? triplet) "windows")
((target-avr? triplet) "none")
- (#t (error "meson: unknown operating system"))))
+ (else
+ (raise
+ (condition
+ (&unsupported-cross-compilation-target-error
+ (build-system meson-build-system)
+ (target triplet)))))))
(cpu_family . ,(cond ((target-x86-32? triplet) "x86")
((target-x86-64? triplet) "x86_64")
((target-arm32? triplet) "arm")
@@ -62,7 +69,12 @@ (define (make-machine-alist triplet)
"ppc64"
"ppc"))
((target-riscv64? triplet) "riscv64")
- (#t (error "meson: unknown architecture"))))
+ (else
+ (raise
+ (condition
+ (&unsupported-cross-compilation-target-error
+ (build-system meson-build-system)
+ (target triplet)))))))
(cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686
(substring triplet 0 4))
((target-x86-64? triplet) "x86_64")
--
2.45.2
next prev parent reply other threads:[~2024-07-12 13:42 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 14:59 [bug#70985] [PATCH 0/4] Use specific errors for unsupported targets Christopher Baines
2024-05-16 15:06 ` [bug#70985] [PATCH 1/4] guix: packages: Add new &package-unsupported-target-error Christopher Baines
2024-05-16 15:06 ` [bug#70985] [PATCH 2/4] gnu: tls: Raise conditions from target->openssl-target Christopher Baines
2024-05-16 15:06 ` [bug#70985] [PATCH 3/4] gnu: cross-libc*: Raise conditions rather than returning #f Christopher Baines
2024-05-16 15:15 ` Ludovic Courtès
2024-05-16 16:16 ` Christopher Baines
2024-05-16 15:06 ` [bug#70985] [PATCH 4/4] guix: build-system: meson: Don't error on unsupported targets Christopher Baines
2024-05-16 15:13 ` Ludovic Courtès
2024-05-16 16:10 ` Christopher Baines
2024-05-16 15:16 ` [bug#70985] [PATCH 0/4] Use specific errors for " Ludovic Courtès
2024-05-17 9:53 ` [bug#70985] [PATCH 3/4] gnu: cross-libc*: Raise conditions rather than returning #f Jean-Pierre De Jesus Diaz
2024-07-05 16:05 ` [bug#70985] [PATCH v2 1/6] guix: packages: Add new &package-unsupported-target-error Christopher Baines
2024-07-05 16:05 ` [bug#70985] [PATCH v2 2/6] gnu: tls: Raise conditions from target->openssl-target Christopher Baines
2024-07-05 16:06 ` [bug#70985] [PATCH v2 3/6] guix: packages: Add &unsupported-cross-compilation-target-error Christopher Baines
2024-07-05 16:06 ` [bug#70985] [PATCH v2 4/6] build-system: meson: Use a more specific exception Christopher Baines
2024-07-05 16:06 ` [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f Christopher Baines
2024-07-07 16:26 ` Efraim Flashner
2024-07-07 16:57 ` Efraim Flashner
2024-07-09 9:25 ` Christopher Baines
2024-07-09 15:21 ` Efraim Flashner
2024-07-12 13:56 ` Christopher Baines
2024-07-05 16:06 ` [bug#70985] [PATCH v2 6/6] build-system: go: Properly handle when a target is unsupported Christopher Baines
2024-07-12 13:41 ` [bug#70985] [PATCH v3 1/6] guix: packages: Add new &package-unsupported-target-error Christopher Baines
2024-07-12 13:41 ` [bug#70985] [PATCH v3 2/6] gnu: tls: Raise conditions from target->openssl-target Christopher Baines
2024-07-12 13:41 ` [bug#70985] [PATCH v3 3/6] guix: packages: Add &unsupported-cross-compilation-target-error Christopher Baines
2024-07-12 13:41 ` Christopher Baines [this message]
2024-07-12 13:41 ` [bug#70985] [PATCH v3 5/6] gnu: rust: Guard against unsupported rust targets Christopher Baines
2024-07-12 14:28 ` Efraim Flashner
2024-07-18 14:16 ` bug#70985: " Christopher Baines
2024-07-12 13:41 ` [bug#70985] [PATCH v3 6/6] build-system: go: Properly handle when a target is unsupported Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0739930bf7312cde64a1d4f6268b7d332bfa8f5f.1720791705.git.mail@cbaines.net \
--to=mail@cbaines.net \
--cc=70985@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).