diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-06-20 22:56:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-06-20 23:35:58 +0200 |
| commit | 50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6 (patch) | |
| tree | 02e8a5311053a2666720cf886f4917c7ca3bec39 /guix/build-system | |
| parent | 85621248621f9ee1d14ae72cd85c60fa0bddd969 (diff) | |
| download | guix-patches-50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6.tar guix-patches-50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6.tar.gz | |
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'.
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/gnu.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 60851c5897..6b481ad45c 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))) |