(address . guix-patches@gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
* guix/build-system/go.scm (default-go): Return a different package
based on the target architecture.
---
guix/build-system/go.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Toggle diff (33 lines)
diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm
index 5e0e5bbad3..8330d3aa8e 100644
--- a/guix/build-system/go.scm
+++ b/guix/build-system/go.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;;
;;; This file is part of GNU Guix.
@@ -110,8 +110,11 @@ (define %go-build-system-modules
(define (default-go)
;; Lazily resolve the binding to avoid a circular dependency.
- (let ((go (resolve-interface '(gnu packages golang))))
- (module-ref go 'go)))
+ (let ((gcc (resolve-interface '(gnu packages gcc)))
+ (golang (resolve-interface '(gnu packages golang))))
+ (if (target-ppc32?)
+ (module-ref gcc 'gccgo-11)
+ (module-ref golang 'go))))
(define (make-go-std)
(module-ref (resolve-interface '(gnu packages golang)) 'make-go-std))
base-commit: 7d72da6b07e99854751187d2694b067733fedda5
prerequisite-patch-id: 861786541b1231efceea28ba4d80d00c000a1b5e
prerequisite-patch-id: 7926cb990933a395cef6672939d171f8cd384170
--
2.34.0