From unknown Sun Jun 22 04:16:01 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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(-) 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")) base-commit: 2eb7cc2677272fe099e5aeef7a75c381776aaf0e -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted From unknown Sun Jun 22 04:16:01 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Efraim Flashner Subject: bug#72066: closed ([PATCH] build/go: Set correct GOOS for Windows.) Message-ID: References: <87frkujc5b.fsf@gmail.com> <2fdf40e33e61f331067205d4e2e493b8aca9218a.1720727493.git.efraim@flashner.co.il> X-Gnu-PR-Message: they-closed 72066 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 72066@debbugs.gnu.org Date: Tue, 04 Feb 2025 09:25:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1738661102-4984-1" This is a multi-part message in MIME format... ------------=_1738661102-4984-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #72066: [PATCH] build/go: Set correct GOOS for Windows. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 72066@debbugs.gnu.org. --=20 72066: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D72066 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1738661102-4984-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 72066-done) by debbugs.gnu.org; 4 Feb 2025 09:24:27 +0000 Received: from localhost ([127.0.0.1]:42635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tfFAR-0001HG-FA for submit@debbugs.gnu.org; Tue, 04 Feb 2025 04:24:27 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:54540) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tfFAO-0001Gy-UA for 72066-done@debbugs.gnu.org; Tue, 04 Feb 2025 04:24:25 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4361815b96cso36542465e9.1 for <72066-done@debbugs.gnu.org>; Tue, 04 Feb 2025 01:24:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738661059; x=1739265859; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=vqrkQtyJ6syIdPGSxP3sgSV00O18XL43T7yFWX1wm3k=; b=Esvd2s5rpVmSpsBDRoSzDBoTZIp8ObcktZDPLryjxpgij5JzId/pbybtHpBPcUGi+7 dQN8+V7PG6/ntTC2Kat4KqlxDdqsXQi9ED7+9bE4EC2q7M/LZlHmWIp3xSp4JKj+xqOf vFzqBisgFjZDzPXrv0hn5uZ09cO5uYsUfgQLcZgzGBghRVIzGpnj+/EO+xADN4fNf/A0 5qpZePv9R/Lu6v9TyM1RYe75Ks5LpuGi5/d1086mGoFDVe4/++zBfGYgzQnd4NcVwxUy 1KB+Unxxqvb91/+dU+nxocYiWcTsVToOn2sBuyjM90Pv8DcCUNGDY2zfxZGiJIAltaZM b9wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738661059; x=1739265859; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vqrkQtyJ6syIdPGSxP3sgSV00O18XL43T7yFWX1wm3k=; b=baZYfC0eOcq/UJ3NZ+7/+d0foGqIQNivID4E065OMYYDHdyX3X9Vxno7UDtn0fVcNi YEBsmsFqAsg5/u+ATmDrBubxScPTbFF31PwCh3oIZfcUWrETU4t56Mf4uHPQ20hZVn7b layQBO3+zGD9jL2z8nlevx7XxesDF/1yo1QkUwfTIaRHbMTMfs5R2yeQ7g88kr2GXvk7 LB0rE/3IqchFl5eUBGrye6D+2R7Vw5OHhEmX1gQ6sIjTw/QnQuG5atV+GS6wXyRsVwGU +FlPSlQs95bceJHY+MQzYmMjsoBBrlU/5VomG0lpe3LDWXV/SwMaOqLAkXbk8wKdnvYY xQeQ== X-Gm-Message-State: AOJu0YyGUgBESHS6tqaxSio6spErABrVHtRNbcFBOUR0XGy9Q0k5bzsZ cv1W/QqPhsC/oA0RlOdQJPTIBcpIp/mwpYh2GVaiL/+m7O94PE/h12LSr4aV X-Gm-Gg: ASbGncsWpEO6zS0DbfWcm25MSikvi0u0sdKXY0wPIiThTxI0EAk79Z+UMIEmK6bBRYA QWcfC4HiB7xY7CvLjgRC4mS2i66Lt2Jd0Aydl0E0XuNtuAohR4qLiC+eDFZbDIIA0UmvHkrtjNu GFB/xOxctS2lMd7kXjTUDTSVeDBjJ06DVcW0NFWo8jl+XlH2IDp7JJAdkCSsXgzr/zMB8EVrIqx Cs92McrHm6oldUOPF1oK5DUPE78Me0cnlSgrKdL/VexzW6YA86Ewys1nNjZkOh1G5JuNZ9C9EN6 xE6BNVGH54/uYkFjIXV3eG6EPMXMuSHkYkDzgjqRsNssDRScevrEcd9kGogcWBXL9LA= X-Google-Smtp-Source: AGHT+IFvk/CAdnCFp/BgAm77lUVyi5aS0QpkB4CIMtF/lSlsp89zGUKyBSqtn9Vf28wixrPN/iXSDQ== X-Received: by 2002:a05:600c:1c29:b0:434:e9ee:c1e with SMTP id 5b1f17b1804b1-438dc43625bmr222960155e9.31.1738661058594; Tue, 04 Feb 2025 01:24:18 -0800 (PST) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc26b15sm218556865e9.11.2025.02.04.01.24.17 for <72066-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 01:24:17 -0800 (PST) From: Sharlatan Hellseher To: 72066-done@debbugs.gnu.org Subject: [PATCH] build/go: Set correct GOOS for Windows. Date: Tue, 04 Feb 2025 09:24:16 +0000 Message-ID: <87frkujc5b.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72066-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Hi Efraim, I've pushed it on to go-team branch, I guess it will trigger Golang world re-build. -- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmeh3MAACgkQdtcnv/Ys 0rW0KRAAxfucewEDN0IDsCnR2zUrDaZTjcdxEFXTRA+do4RUNqvXoPHeoJ8pKv3h HDRgvenLhR3cfeGdHneak4vLD6DFjLexHA8EzyTzojlSHa8nisI49sESbpwzZhWZ cPQgRbON52RNDWiM/Im88wU3gzGZOw9GOIvlTcOr9EW8BjapE90WQutDhYL6KuKR KjJdv0OrQRjAH8BEwpMKaeqdS6J/jlZ7s9yNTvfYTj5BNGPiwE+Y1HWF1zIg9dRB oF053uuD9yVocCsymNhz70HM99j1FpYJqzuKImx2gOHJzYcJ6+ZY23kdDcXNoqgt WLhquraE3fyO1Ro+WbKwyIhcyO8xAUVsc3vtzGnroz4hnVlB13BCD8hN8mJlej3N ouFC9pgluNT/7miQOrj/PJBQwLdsHtmMZ5H1qvjK7cWp/XEjjM0tJ9HoJbHqfaCs TQ8y/QINwb9PFOeHJuqBQ5AL93tag06Yms5tBS3xECSpge1A8cgi3RXPq87nHTDv DYP4zt/nT+EG99yynGw4/0rYPCyRLqvwS7sg86t8U80myjPyMKS6msEAM13Rjqo+ ydD9j51csImO19P5Y3e2xpcjw3BMbOHbQlCF7T6g16a7Mqz3h7ZgG2QmrFhbD/sI eGOUvJIZdRqyjKarXQJ42lYlTNKzoNfpfWmRrEYuVJbwv6aN8wU= =nCeO -----END PGP SIGNATURE----- --=-=-=-- ------------=_1738661102-4984-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] build/go: Set correct GOOS for Windows. 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 X-Debbugs-Cc: Katherine Cox-Buday , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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(-) 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")) base-commit: 2eb7cc2677272fe099e5aeef7a75c381776aaf0e -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted ------------=_1738661102-4984-1--