futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build-system: meson: Use a more specific exception.

Browse Source 
This is handled by (guix ui).

* guix/build-system/meson.scm (make-machine-alist): Use a more specific
exception.

Change-Id: I842ba63739fdefe04460e938c7bc8aa54ea57b96
This commit is contained in:
Christopher Baines 2024-07-05 13:45:11 +02:00
parent b6afc69605
commit e661121e39
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guix/build-system/meson.scm
View File

@ -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")