mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
build-system/go: Respect #:imported-modules when cross-compiling.
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:
parent
1cf39c41cf
commit
9e4d8c7518
1 changed files with 34 additions and 33 deletions
|
@ -240,6 +240,7 @@ (define* (go-cross-build name
|
|||
(substitutable? #t))
|
||||
"Cross-build NAME using GO, where TARGET is a GNU triplet and with INPUTS."
|
||||
(define builder
|
||||
(with-imported-modules imported-modules
|
||||
#~(begin
|
||||
(use-modules #$@(sexp->gexp modules))
|
||||
|
||||
|
@ -278,7 +279,7 @@ (define %outputs
|
|||
#:tests? #$tests?
|
||||
#:make-dynamic-linker-cache? #f ;cross-compiling
|
||||
#:allow-go-reference? #$allow-go-reference?
|
||||
#:inputs %build-inputs)))
|
||||
#:inputs %build-inputs))))
|
||||
|
||||
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
|
||||
system #:graft? #f)))
|
||||
|
|
Loading…
Reference in a new issue