[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: gnu: Add gccgo-12.
From: |
guix-commits |
Subject: |
01/04: gnu: Add gccgo-12. |
Date: |
Thu, 9 Feb 2023 15:07:18 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 315359a4f3ae4b2ef5431ed2850decff60f7aa9e
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Feb 9 19:56:22 2023 +0200
gnu: Add gccgo-12.
* gnu/packages/gcc.scm (gccgo-12): New variable.
(make-gccgo)[arguments]: Adapt custom 'remove-tool-reference-from-libgo
to changes in the source.
---
gnu/packages/gcc.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index bb154cac62..bf3c753b2d 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus
<rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021, 2022 Efraim Flashner
<efraim@flashner.co.il>
+;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -1062,8 +1062,11 @@ provides the GNU compiler for the Go programming
language.")
(substitute* "libgo/Makefile.in"
(("(GccgoToolDir = \\\")[^\\\"]+" _ start)
(string-append start "/nonexistent"))
- (("(DefaultGoroot = \\\")[^\\\"]+" _ start)
- (string-append start "/nonexistent"))
+ ,@(if (version>=? (package-version gccgo) "12.0")
+ '((("(defaultGOROOT = `)[^`]+" _ start)
+ (string-append start "/nonexistent")))
+ '((("(DefaultGoroot = \\\")[^\\\"]+" _ start)
+ (string-append start "/nonexistent"))))
(("(defaultGOROOTValue.*?return `)[^`]+" _ start)
(string-append start "/nonexistent"))))))))))))
@@ -1087,6 +1090,9 @@ provides the GNU compiler for the Go programming
language."))
(define-public gccgo-11
(make-gccgo gcc-11))
+(define-public gccgo-12
+ (make-gccgo gcc-12))
+
(define %objc-search-paths
(list (search-path-specification
(variable "OBJC_INCLUDE_PATH")