[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/12: build-system/go: Respect #:imported-modules when cross-compiling.
From: |
guix-commits |
Subject: |
08/12: build-system/go: Respect #:imported-modules when cross-compiling. |
Date: |
Sat, 24 Sep 2022 12:15:30 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 9e4d8c75183c226d0cba2de3b40e6a9e603ae43b
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Sep 13 13:01:05 2022 +0200
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
e37dcf63dcea0817ffd74722ee5ff2d103aa2157.
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>
---
guix/build-system/go.scm | 67 ++++++++++++++++++++++++------------------------
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm
index 5e0e5bbad3..4b3b67b08f 100644
--- a/guix/build-system/go.scm
+++ b/guix/build-system/go.scm
@@ -240,45 +240,46 @@ commit hash and its date rather than a proper release
tag."
(substitutable? #t))
"Cross-build NAME using GO, where TARGET is a GNU triplet and with INPUTS."
(define builder
- #~(begin
- (use-modules #$@(sexp->gexp modules))
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
- (define %build-host-inputs
- #+(input-tuples->gexp build-inputs))
+ (define %build-host-inputs
+ #+(input-tuples->gexp build-inputs))
- (define %build-target-inputs
- (append #$(input-tuples->gexp host-inputs)
+ (define %build-target-inputs
+ (append #$(input-tuples->gexp host-inputs)
#+(input-tuples->gexp target-inputs)))
- (define %build-inputs
- (append %build-host-inputs %build-target-inputs))
+ (define %build-inputs
+ (append %build-host-inputs %build-target-inputs))
- (define %outputs
- #$(outputs->gexp outputs))
+ (define %outputs
+ #$(outputs->gexp outputs))
- (go-build #:name #$name
- #:source #+source
- #:system #$system
- #:phases #$phases
- #:outputs %outputs
- #:target #$target
- #:goarch #$goarch
- #:goos #$goos
- #:inputs %build-target-inputs
- #:native-inputs %build-host-inputs
- #:search-paths '#$(map search-path-specification->sexp
- search-paths)
- #:native-search-paths '#$(map
- search-path-specification->sexp
- native-search-paths)
- #:install-source? #$install-source?
- #:import-path #$import-path
- #:unpack-path #$unpack-path
- #:build-flags #$build-flags
- #:tests? #$tests?
- #:make-dynamic-linker-cache? #f ;cross-compiling
- #:allow-go-reference? #$allow-go-reference?
- #:inputs %build-inputs)))
+ (go-build #:name #$name
+ #:source #+source
+ #:system #$system
+ #:phases #$phases
+ #:outputs %outputs
+ #:target #$target
+ #:goarch #$goarch
+ #:goos #$goos
+ #:inputs %build-target-inputs
+ #:native-inputs %build-host-inputs
+ #:search-paths '#$(map search-path-specification->sexp
+ search-paths)
+ #:native-search-paths '#$(map
+ search-path-specification->sexp
+ native-search-paths)
+ #:install-source? #$install-source?
+ #:import-path #$import-path
+ #:unpack-path #$unpack-path
+ #:build-flags #$build-flags
+ #:tests? #$tests?
+ #:make-dynamic-linker-cache? #f ;cross-compiling
+ #:allow-go-reference? #$allow-go-reference?
+ #:inputs %build-inputs))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))
- branch master updated (20fbc0bb08 -> b814bdf441), guix-commits, 2022/09/24
- 01/12: narinfo: Fix misleading docstring., guix-commits, 2022/09/24
- 04/12: gnu: Add texlive-latex-frankenstein., guix-commits, 2022/09/24
- 07/12: gnu: Add rot8., guix-commits, 2022/09/24
- 02/12: substitute: Test behavior with unroutable substitute server addresses., guix-commits, 2022/09/24
- 05/12: gnu: Add texlive-latex-sidecap., guix-commits, 2022/09/24
- 08/12: build-system/go: Respect #:imported-modules when cross-compiling.,
guix-commits <=
- 10/12: gnu: emacs-lua-mode: Fix build., guix-commits, 2022/09/24
- 09/12: gnu: go-ipfs: Unbundle many dependencies., guix-commits, 2022/09/24
- 12/12: Update NEWS., guix-commits, 2022/09/24
- 03/12: linux-container: Mark socket pair as SOCK_CLOEXEC., guix-commits, 2022/09/24
- 06/12: gnu: Add batsignal., guix-commits, 2022/09/24
- 11/12: gnu: avizo: Update to 1.2.1., guix-commits, 2022/09/24