civodul pushed a commit to branch master
in repository guix.
commit bdaf38a6e04052a22b62ae41c72f32cf16356314
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Dec 20 14:37:40 2021 +0100
build-system/meson: Define build variables when cross-compiling.
Fixes <https://issues.guix.gnu.org/52574>.
Reported by L p R n d n <[email protected]>.
* guix/build-system/meson.scm (meson-cross-build)[builder]: Define
'%build-host-inputs', '%build-target-inputs', '%build-inputs', and
'%outputs'.
---
guix/build-system/meson.scm | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index ba7441a..ad604f8 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -287,6 +287,19 @@ SOURCE has a 'meson.build' file."
#~(begin
(use-modules #$@(sexp->gexp modules))
+ (define %build-host-inputs
+ #+(input-tuples->gexp build-inputs))
+
+ (define %build-target-inputs
+ (append #$(input-tuples->gexp host-inputs)
+ #+(input-tuples->gexp target-inputs)))
+
+ (define %build-inputs
+ (append %build-host-inputs %build-target-inputs))
+
+ (define %outputs
+ #$(outputs->gexp outputs))
+
(define build-phases
#$(let ((phases (if (pair? phases) (sexp->gexp phases) phases)))
(if glib-or-gtk?
