From patchwork Tue Jul 6 07:30:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 31190 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9E04F27BC81; Tue, 6 Jul 2021 08:31:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 370A027BC78 for ; Tue, 6 Jul 2021 08:31:42 +0100 (BST) Received: from localhost ([::1]:42454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0fYT-0008Fq-93 for patchwork@mira.cbaines.net; Tue, 06 Jul 2021 03:31:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0fXq-0008AS-T2 for guix-patches@gnu.org; Tue, 06 Jul 2021 03:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0fXq-0002yq-Hy for guix-patches@gnu.org; Tue, 06 Jul 2021 03:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0fXq-0005Wu-9K for guix-patches@gnu.org; Tue, 06 Jul 2021 03:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49432] [PATCH] gnu: gccgo: Override empty GOROOT/GCCGOTOOLDIR Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jul 2021 07:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49432 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49432@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162555665021235 (code B ref -1); Tue, 06 Jul 2021 07:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jul 2021 07:30:50 +0000 Received: from localhost ([127.0.0.1]:47166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0fXe-0005WR-GX for submit@debbugs.gnu.org; Tue, 06 Jul 2021 03:30:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:57614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0fXc-0005WH-3r for submit@debbugs.gnu.org; Tue, 06 Jul 2021 03:30:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0fXb-0007kJ-HG for guix-patches@gnu.org; Tue, 06 Jul 2021 03:30:47 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:35699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0fXX-0002he-KY for guix-patches@gnu.org; Tue, 06 Jul 2021 03:30:47 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1625556635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JduiJjlWJSIjCwYQpJm+qgUnEDByvnWrEHncDF4czms=; b=eCNVPS4TFkpvZyjMUIbzvsP6aPFPDO/mUQS1JBPSeaFUeelltFSammUY2KQC8ecwX6qOqE A/CFAXALJyJCn5DKg8KG8cKASJuDAGyk0xhc0cgeJjkm3JRPxfFj6F7NXtrxGmGEs872xl y9I/YVSe6njxflG8EU6elb7M2trd87o= Date: Tue, 6 Jul 2021 00:30:32 -0700 Message-Id: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: aa6e6fb2e9ea231d12d49a8925fddd8d2686ea94 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"