From patchwork Tue Feb 22 11:08:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 37397 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 70EA427BBEA; Tue, 22 Feb 2022 11:10:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3ACE427BBE9 for ; Tue, 22 Feb 2022 11:10:13 +0000 (GMT) Received: from localhost ([::1]:39422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMT3c-0001DL-Ca for patchwork@mira.cbaines.net; Tue, 22 Feb 2022 06:10:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMT3S-0001DD-Ut for guix-patches@gnu.org; Tue, 22 Feb 2022 06:10:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMT3S-0004h2-Kj for guix-patches@gnu.org; Tue, 22 Feb 2022 06:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nMT3S-0005DN-8g for guix-patches@gnu.org; Tue, 22 Feb 2022 06:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54105] [PATCH] build-system/go: Use different default go on powerpc-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 11:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54105 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54105@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164552816619986 (code B ref -1); Tue, 22 Feb 2022 11:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Feb 2022 11:09:26 +0000 Received: from localhost ([127.0.0.1]:40144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMT2r-0005CI-UD for submit@debbugs.gnu.org; Tue, 22 Feb 2022 06:09:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:46334) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMT2o-0005C9-T4 for submit@debbugs.gnu.org; Tue, 22 Feb 2022 06:09:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMT2f-0000rv-JA for guix-patches@gnu.org; Tue, 22 Feb 2022 06:09:17 -0500 Received: from flashner.co.il ([178.62.234.194]:38714) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMT2a-0004Qo-15 for guix-patches@gnu.org; Tue, 22 Feb 2022 06:09:13 -0500 Received: from localhost (unknown [31.210.181.166]) by flashner.co.il (Postfix) with ESMTPSA id 7331240233; Tue, 22 Feb 2022 11:09:03 +0000 (UTC) From: Efraim Flashner Date: Tue, 22 Feb 2022 13:08:29 +0200 Message-Id: X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 7d72da6b07e99854751187d2694b067733fedda5 prerequisite-patch-id: 861786541b1231efceea28ba4d80d00c000a1b5e prerequisite-patch-id: 7926cb990933a395cef6672939d171f8cd384170 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 ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021-2022 Ludovic Courtès -;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen ;;; ;;; 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))