From 68d15fcf20feddb72f5c2d2ff7d754dcc4f409df Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Tue, 6 Jul 2021 00:30:32 -0700 Subject: 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 --- 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 493ff2659f..e7807a4797 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -871,9 +871,9 @@ (define (make-gccgo gcc) (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" -- cgit v1.2.3