futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: gcc: Change make-gccgo to use gexp's.

Browse Source 
As otherwise this seems to generate broken derivations for i586-gnu.

* gnu/packages/gcc.scm (make-gccgo): Use gexp's for the package arguments.
This commit is contained in:
Christopher Baines 2023-05-11 15:54:10 +01:00
parent ded8cdbe89
commit 70986f052a
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gnu/packages/gcc.scm
View File

@ -1156,34 +1156,34 @@ provides the GNU compiler for the Go programming language.")
(arguments
(substitute-keyword-arguments (package-arguments gccgo)
((#:phases phases)
`(modify-phases ,phases
(add-after 'install 'wrap-go-with-tool-path
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(exedir (string-append out "/libexec/gcc"))
(tooldir (dirname (car (find-files exedir "^cgo$")))))
(wrap-program (string-append out "/bin/go")
`("GCCGOTOOLDIR" =
(,(string-append "${GCCGOTOOLDIR:-" tooldir "}")))
`("GOROOT" =
(,(string-append "${GOROOT:-" out "}")))))))
(add-before 'configure 'fix-gotools-runpath
(lambda _
(substitute* "gotools/Makefile.in"
(("AM_LDFLAGS =" all)
(string-append all " -Wl,-rpath=$(libdir) ")))))
(add-before 'configure 'remove-tool-reference-from-libgo
(lambda _
(substitute* "libgo/Makefile.in"
(("(GccgoToolDir = \\\")[^\\\"]+" _ 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"))))))))))))
#~(modify-phases #$phases
(add-after 'install 'wrap-go-with-tool-path
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(exedir (string-append out "/libexec/gcc"))
(tooldir (dirname (car (find-files exedir "^cgo$")))))
(wrap-program (string-append out "/bin/go")
`("GCCGOTOOLDIR" =
(,(string-append "${GCCGOTOOLDIR:-" tooldir "}")))
`("GOROOT" =
(,(string-append "${GOROOT:-" out "}")))))))
(add-before 'configure 'fix-gotools-runpath
(lambda _
(substitute* "gotools/Makefile.in"
(("AM_LDFLAGS =" all)
(string-append all " -Wl,-rpath=$(libdir) ")))))
(add-before 'configure 'remove-tool-reference-from-libgo
(lambda _
(substitute* "libgo/Makefile.in"
(("(GccgoToolDir = \\\")[^\\\"]+" _ 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"))))))))))))
(define-public gccgo-4.9
(custom-gcc (package