Browse Source

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'.
wip-haskell-updates-2
Ludovic Courtès 2 years ago
parent
commit
50e7e6a065
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 6
      guix/build-system/gnu.scm

6
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)))

Loading…
Cancel
Save