me/guix
Archived
1
0
Fork 0
Code Activity

gnu: make-gccgo: Override empty GOROOT/GCCGOTOOLDIR

Browse source 
gnu/packages/gcc.scm (make-gccgo)[arguments]: Set tool paths
(GOROOT and GCCGOTOOLDIR) even if they are already set to "".

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Sarah Morgensen 2021-07-06 00:30:32 -07:00 • committed by Efraim Flashner
parent 51bf893e53
commit 68d15fcf20
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/gcc.scm
View file

@ -871,9 +871,9 @@ provides the GNU compiler for the Go programming language.")
(tooldir (dirname (car (find-files exedir "^cgo$"))))) (tooldir (dirname (car (find-files exedir "^cgo$")))))
(wrap-program (string-append out "/bin/go") (wrap-program (string-append out "/bin/go")
`("GCCGOTOOLDIR" = `("GCCGOTOOLDIR" =
(,(string-append "${GCCGOTOOLDIR-" tooldir "}"))) (,(string-append "${GCCGOTOOLDIR:-" tooldir "}")))
`("GOROOT" = `("GOROOT" =
(,(string-append "${GOROOT-" out "}"))))))) (,(string-append "${GOROOT:-" out "}")))))))
(add-before 'configure 'fix-gotools-runpath (add-before 'configure 'fix-gotools-runpath
(lambda _ (lambda _
(substitute* "gotools/Makefile.in" (substitute* "gotools/Makefile.in"