guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/14: build-system/meson: Define build variables when cross-compiling.


From: guix-commits
Subject: 01/14: build-system/meson: Define build variables when cross-compiling.
Date: Mon, 20 Dec 2021 10:24:10 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit bdaf38a6e04052a22b62ae41c72f32cf16356314
Author: Ludovic Courtès <ludo@gnu.org>
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    <guix@lprndn.info>.
    
    * 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?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]