[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/11: build-system: meson: Use a more specific exception.
From: |
guix-commits |
Subject: |
04/11: build-system: meson: Use a more specific exception. |
Date: |
Mon, 15 Jul 2024 17:35:35 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository guix.
commit e661121e39c664a1b985fafc3e6bdb830ada58fd
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Fri Jul 5 13:45:11 2024 +0200
build-system: meson: Use a more specific exception.
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 @@
#: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 @@ for 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 @@ for 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")
- branch master updated (0e5e3edec5 -> bf6ab0e0f5), guix-commits, 2024/07/15
- 01/11: guix: packages: Add new &package-unsupported-target-error., guix-commits, 2024/07/15
- 09/11: gnu: make-mingw-w64: Update to 12.0.0., guix-commits, 2024/07/15
- 11/11: gnu: mingw-w64-tools: Update to 12.0.0., guix-commits, 2024/07/15
- 03/11: guix: packages: Add &unsupported-cross-compilation-target-error., guix-commits, 2024/07/15
- 02/11: gnu: tls: Raise conditions from target->openssl-target., guix-commits, 2024/07/15
- 04/11: build-system: meson: Use a more specific exception.,
guix-commits <=
- 05/11: gnu: rust: Guard against unsupported rust targets., guix-commits, 2024/07/15
- 08/11: gnu: make-mingw-w64: Use G-Expressions., guix-commits, 2024/07/15
- 06/11: build-system: go: Properly handle when a target is unsupported., guix-commits, 2024/07/15
- 10/11: gnu: mingw-w64-tools: Use G-Expressions., guix-commits, 2024/07/15
- 07/11: gnu: make-mingw-w64: Memoize., guix-commits, 2024/07/15