all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sarah Morgensen via Guix-patches via <guix-patches@gnu.org>
To: 49432@debbugs.gnu.org
Subject: [bug#49432] [PATCH] gnu: gccgo: Override empty GOROOT/GCCGOTOOLDIR
Date: Tue,  6 Jul 2021 00:30:32 -0700	[thread overview]
Message-ID: <f3e624c4092f65a31d36bf5b8ecc0f04f1fe4a45.1625556128.git.iskarian@mgsn.dev> (raw)

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

It turns out some tools use

  GOROOT='' go env GOROOT

to find Go, which was breaking with Gccgo. This little patch fixes that.

As for the commit title, I wasn't sure if "gnu: gccgo" or "gnu: make-gccgo"
was more appropriate here... there aren't a lot of examples in the commit log!

Thanks,
Sarah

 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 2fe30b1321..02d6824a99 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"

base-commit: aa6e6fb2e9ea231d12d49a8925fddd8d2686ea94
-- 
2.31.1





             reply	other threads:[~2021-07-06  7:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-06  7:30 Sarah Morgensen via Guix-patches via [this message]
2021-12-07 13:27 ` bug#49432: [PATCH] gnu: gccgo: Override empty GOROOT/GCCGOTOOLDIR Efraim Flashner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f3e624c4092f65a31d36bf5b8ecc0f04f1fe4a45.1625556128.git.iskarian@mgsn.dev \
    --to=guix-patches@gnu.org \
    --cc=49432@debbugs.gnu.org \
    --cc=iskarian@mgsn.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.