From 7b2f7498628b0ca8481820581dcd3f6e44e2cb17 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 7 Mar 2022 22:43:09 +0200 Subject: [PATCH] build-system/meson: Add more cross-compilation targets. * guix/build-system/meson.scm (make-machine-alist): Add riscv64-linux option for cpu_family. Add riscv64-linux and powerpc-linux options for endian. --- guix/build-system/meson.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index ad604f8871..9fee6c4570 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2022 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,6 +59,7 @@ (define (make-machine-alist triplet) (if (target-64bit? triplet) "ppc64" "ppc")) + ((target-riscv64? triplet) "riscv64") (#t (error "meson: unknown architecture")))) (cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686 (substring triplet 0 4)) @@ -78,6 +80,8 @@ (define (make-machine-alist triplet) ;; At least in Guix. Aarch64 and 32-bit arm ;; have a big-endian mode as well. ((target-arm? triplet) "little") + ((target-ppc32? triplet) "big") + ((target-riscv64? triplet) "little") (#t (error "meson: unknown architecture")))))) (define (make-binaries-alist triplet)