guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

19/172: gnu: go-1.20: Build with gccgo-12 on some systems.


From: guix-commits
Subject: 19/172: gnu: go-1.20: Build with gccgo-12 on some systems.
Date: Mon, 21 Oct 2024 17:30:25 -0400 (EDT)

sharlatan pushed a commit to branch go-team
in repository guix.

commit d20be8bdb17cfbf94f7544150c71eca155246725
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Sep 11 13:04:03 2024 +0300

    gnu: go-1.20: Build with gccgo-12 on some systems.
    
    * gnu/packages/golang.scm (go-1.20)[native-inputs]: Don't replace the
    gccgo input on architectures bootstrapping go with it.
    
    Change-Id: I26831b2bcfe623f6eb0ac7c16b463e5e873110e6
    Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/golang.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 779cc69ebe..166e7caa44 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
 ;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
 ;;; Copyright © 2016, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
@@ -812,7 +812,10 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
      ;; See 'src/cmd/dist/notgo117.go' in the source code distribution,
      ;; as well as the upstream discussion of this topic:
      ;; https://go.dev/issue/44505
-     (alist-replace "go" (list go-1.17) (package-native-inputs go-1.17)))))
+     ;; We continue to use gccgo-12 since it provides go-1.18.
+     (if (member (%current-system) (package-supported-systems go-1.4))
+         (alist-replace "go" (list go-1.17) (package-native-inputs go-1.17))
+         (package-native-inputs go-1.17)))))
 
 (define-public go-1.21
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]