me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Efraim Flashner 2023-02-09 19:56:22 +02:00
parent 58a95d599e
commit 315359a4f3
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gcc.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; 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 © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com> ;;; 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" (substitute* "libgo/Makefile.in"
(("(GccgoToolDir = \\\")[^\\\"]+" _ start) (("(GccgoToolDir = \\\")[^\\\"]+" _ start)
(string-append start "/nonexistent")) (string-append start "/nonexistent"))
(("(DefaultGoroot = \\\")[^\\\"]+" _ start) ,@(if (version>=? (package-version gccgo) "12.0")
(string-append start "/nonexistent")) '((("(defaultGOROOT = `)[^`]+" _ start)
(string-append start "/nonexistent")))
'((("(DefaultGoroot = \\\")[^\\\"]+" _ start)
(string-append start "/nonexistent"))))
(("(defaultGOROOTValue.*?return `)[^`]+" _ start) (("(defaultGOROOTValue.*?return `)[^`]+" _ start)
(string-append start "/nonexistent")))))))))))) (string-append start "/nonexistent"))))))))))))
@ -1087,6 +1090,9 @@ provides the GNU compiler for the Go programming language."))
(define-public gccgo-11 (define-public gccgo-11
(make-gccgo gcc-11)) (make-gccgo gcc-11))
(define-public gccgo-12
(make-gccgo gcc-12))
(define %objc-search-paths (define %objc-search-paths
(list (search-path-specification (list (search-path-specification
(variable "OBJC_INCLUDE_PATH") (variable "OBJC_INCLUDE_PATH")