branch master updated: gnu: make-gccgo: Override empty GOROOT/GCCGOTOOLDIR

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 68d15fc  gnu: make-gccgo: Override empty GOROOT/GCCGOTOOLDIR
68d15fc is described below

commit 68d15fcf20feddb72f5c2d2ff7d754dcc4f409df
Author: Sarah Morgensen <iskarian@mgsn.dev>
AuthorDate: Tue Jul 6 00:30:32 2021 -0700

    gnu: make-gccgo: Override empty GOROOT/GCCGOTOOLDIR
    
    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>
---
 gnu/packages/gcc.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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