guix-commits
[Top][All Lists]
Advanced

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

01/03: build-system/gnu: Cross builds properly handle #:allowed-referenc


From: guix-commits
Subject: 01/03: build-system/gnu: Cross builds properly handle #:allowed-references & co.
Date: Sat, 20 Jun 2020 17:36:48 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Jun 20 22:56:08 2020 +0200

    build-system/gnu: Cross builds properly handle #:allowed-references & co.
    
    Fixes <https://bugs.gnu.org/41775>.
    
    * guix/build-system/gnu.scm (gnu-cross-build)[canonicalize-reference]:
    Pass TARGET and SYSTEM to 'package-cross-derivation'.
---
 guix/build-system/gnu.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 60851c5..6b481ad 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -513,9 +513,11 @@ platform."
   (define canonicalize-reference
     (match-lambda
      ((? package? p)
-      (derivation->output-path (package-cross-derivation store p system)))
+      (derivation->output-path (package-cross-derivation store p
+                                                         target system)))
      (((? package? p) output)
-      (derivation->output-path (package-cross-derivation store p system)
+      (derivation->output-path (package-cross-derivation store p
+                                                         target system)
                                output))
      ((? string? output)
       output)))



reply via email to

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