guix-commits
[Top][All Lists]
Advanced

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

01/03: gnu: go-1.14: On systems not supported by go-1.4 use gccgo-12.


From: guix-commits
Subject: 01/03: gnu: go-1.14: On systems not supported by go-1.4 use gccgo-12.
Date: Tue, 14 Feb 2023 07:05:13 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 455ecb5cbe3201e4c1591ed12650cad6ba34893a
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Feb 13 16:27:48 2023 +0200

    gnu: go-1.14: On systems not supported by go-1.4 use gccgo-12.
    
    * gnu/packages/golang.scm (go-1.14)[native-inputs]: On systems not
    supported by go-1.4 replace gccgo-10 with gccgo-12.
    (go-1.17)[native-inputs]: Remove workaround and inherit from go-1.14.
---
 gnu/packages/golang.scm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 829b216cf3..55c489a5d7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -463,7 +463,7 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
     (native-inputs
      `(,@(if (member (%current-system) (package-supported-systems go-1.4))
            `(("go" ,go-1.4))
-           `(("go" ,gccgo-10)))
+           `(("go" ,gccgo-12)))
        ("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch"))
        ,@(match (%current-system)
            ((or "armhf-linux" "aarch64-linux")
@@ -837,13 +837,7 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
                   "README.md" "SECURITY.md"))))))))
     (inputs (if (not (target-arm?))
               (alist-delete "gcc:lib" (package-inputs go-1.16))
-              (package-inputs go-1.16)))
-    (native-inputs
-     (if (not (member (%current-system) (package-supported-systems go-1.4)))
-       ;; gccgo-10.4, 11.3 and lower has a bug which causes bootstrapping
-       ;; to fail. Use go-1.16 until we have a newer version available.
-       (alist-replace "go" (list go-1.16) (package-native-inputs go-1.16))
-       (package-native-inputs go-1.16)))))
+              (package-inputs go-1.16)))))
 
 (define-public go-1.18
   (package



reply via email to

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