From patchwork Thu Jul 11 21:34:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 29210 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 0BE0527BBE9; Thu, 11 Jul 2024 22:36:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2116B27BBE2 for ; Thu, 11 Jul 2024 22:36:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1SO-0005Tr-7P; Thu, 11 Jul 2024 17:36:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sS1SM-0005Ns-Mj for guix-patches@gnu.org; Thu, 11 Jul 2024 17:36:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sS1SM-0007F5-E1 for guix-patches@gnu.org; Thu, 11 Jul 2024 17:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1SM-0004Gc-2j; Thu, 11 Jul 2024 17:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72066] [PATCH] build/go: Set correct GOOS for Windows. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2024 21:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72066 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72066@debbugs.gnu.org Cc: Efraim Flashner , Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.172073375916391 (code B ref -1); Thu, 11 Jul 2024 21:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jul 2024 21:35:59 +0000 Received: from localhost ([127.0.0.1]:52788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1SI-0004GJ-G6 for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:35:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:33912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1SE-0004G7-Jz for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:35:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sS1SE-0005Aq-FS for guix-patches@gnu.org; Thu, 11 Jul 2024 17:35:54 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sS1SB-0006wJ-I6 for guix-patches@gnu.org; Thu, 11 Jul 2024 17:35:53 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-6b2c95b6c5aso7282256d6.2 for ; Thu, 11 Jul 2024 14:35:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720733750; x=1721338550; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=UKTZGxgN0YyA+Txn0J1etHSwPTWcaGMR/5ZCl64jDgQ=; b=d7h9feX7KcPppetL+a0No5RcM/ZOVzX16kU8/W6oPCwSHayY8g5Yq6R+GJ4s6iPEI5 jUkLirVN5bkxEXpdnkI0BLkVwsWxdQ4hRLbyK/LHkj1BUrSv3TIN7ygMZMkLKNTl/hF8 FWN2w0BAr2Tgix5irqB7pYYx9/I9doy841buny1O2no/ryJDhZ1r9AggBD6ARRdvU3nk XC60XlonZo/4c8RLHTbUiQJUCEtvziX6byAQr7kTiptOhvLlUklDoHyXSw1QLDafE8l+ r6qS1gekm4pSGtgGqBg8UhWIvEaMHGo0U+iD1K4DEHL6rUPDmWhYNydpJThQhcxAGHOO kUSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720733750; x=1721338550; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=UKTZGxgN0YyA+Txn0J1etHSwPTWcaGMR/5ZCl64jDgQ=; b=nCp+KyDrFZcT5W9BS8c4kHFZa1jXYIlvJx1XNw+k/dHGi7qAbXWcyTcJ0Rtw0/1vUz rY9Vb0/IW89NcEF3XGjQJLyjkt6HehkZV2m8wvqFraMqu3ZW+sYeN768Eq/daShj6slP uRpJgSxurWzeR1hPeBSHxG8UwbHfsVTGfmAZ553LGFOuFc2pa2gw6Jiaum5V+GaWAziG R3Fa2hPvA8f7eVVxRVrDt32e6DwQ7ZVPolK8EIHKPvS7Q2OWaJVVUztfQ1pIi2n9ehOb 40r8pfhLCkuMPc7pawOpOXr5p9NIUhvKikr7H4U+DFhSvHvhac6Ovc98rvw/uxw/NIVm NOzQ== X-Gm-Message-State: AOJu0YxUBjZrcHU+TviKes7po+AyTsToLkTFlP7UyXO9vDp5X7bt3lnF 2BcT9RWPARjjaeOtbInU9/jA0QkV8ItEgh1xnRQZG9pJcTveT+N/7QzXJmNw X-Google-Smtp-Source: AGHT+IHycmVFmHmNT+4XEshFUHTftsy3AKpu0enmdjJIGUgs8NYYrTrnfMbky2fxdXSAZFX/agqBFg== X-Received: by 2002:a05:6214:487:b0:6b5:116:b212 with SMTP id 6a1803df08f44-6b61c1c569dmr122746306d6.45.1720733750279; Thu, 11 Jul 2024 14:35:50 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61b9c4f67sm29319956d6.10.2024.07.11.14.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 14:35:49 -0700 (PDT) From: Efraim Flashner Date: Fri, 12 Jul 2024 00:34:56 +0300 Message-ID: <2fdf40e33e61f331067205d4e2e493b8aca9218a.1720727493.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f30; envelope-from=efraim.flashner@gmail.com; helo=mail-qv1-xf30.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/go-build-system.scm (setup-go-environment): When building for windows override the inherited GOOS and set it to 'windows'. Change-Id: I310aa490bb010370112cfa00c69df2d36387c323 --- guix/build/go-build-system.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) base-commit: 2eb7cc2677272fe099e5aeef7a75c381776aaf0e diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm index d95262bd6c..e0de2308f2 100644 --- a/guix/build/go-build-system.scm +++ b/guix/build/go-build-system.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020, 2021, 2023 Efraim Flashner +;;; Copyright © 2020, 2021, 2023, 2024 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2024 Ekaitz Zarraga ;;; Copyright © 2024 Picnoir @@ -175,8 +175,11 @@ (define* (setup-go-environment #:key inputs outputs goos goarch #:allow-other-ke ;; that Guix targets. (setenv "GOARCH" (or goarch (getenv "GOHOSTARCH"))) - (setenv "GOOS" (or goos - (getenv "GOHOSTOS"))) + (setenv "GOOS" (cond ((and goos + (string=? "mingw" goos)) + "windows") + (goos goos) + (else (getenv "GOHOSTOS")))) (match goarch ("arm" (setenv "GOARM" "7"))