ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/go: Respect #:imported-modules when cross-compiling.

Browse source 
Previously, #:imported-modules was ignored, causing cross-compilation
failures.  This bug seems seems to have been introduced in
e37dcf63dc.

After this commit, there remain other cross-compilation problems,
e.g. <https://issues.guix.gnu.org/51981> fixes one of them.

* guix/build-system/go.scm (go-cross-build)[builder]: Wrap in
with-imported-modules.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Maxime Devos 2022-09-13 13:01:05 +02:00 committed by Ludovic Courtès
parent 1cf39c41cf
commit 9e4d8c7518
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
guix/build-system/go.scm
View file

@ -240,6 +240,7 @@ (define* (go-cross-build name
(substitutable? #t)) (substitutable? #t))
"Cross-build NAME using GO, where TARGET is a GNU triplet and with INPUTS." "Cross-build NAME using GO, where TARGET is a GNU triplet and with INPUTS."
(define builder (define builder
(with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@(sexp->gexp modules)) (use-modules #$@(sexp->gexp modules))
@ -278,7 +279,7 @@ (define %outputs
#:tests? #$tests? #:tests? #$tests?
#:make-dynamic-linker-cache? #f ;cross-compiling #:make-dynamic-linker-cache? #f ;cross-compiling
#:allow-go-reference? #$allow-go-reference? #:allow-go-reference? #$allow-go-reference?
#:inputs %build-inputs))) #:inputs %build-inputs))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f)))