diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2024-07-12 00:34:56 +0300 |
|---|---|---|
| committer | Guix Patches Tester <> | 2024-07-11 23:55:40 +0200 |
| commit | 23b1f6aa8577c4c9a98fbfa0d73dcf5bc54fe405 (patch) | |
| tree | f3f31ee61e017e8cef08659e0d8e01bd6cd66ab6 | |
| parent | e73154daf667effef9b7928b95fa180bf90dd680 (diff) | |
| download | guix-patches-issue-72066.tar guix-patches-issue-72066.tar.gz | |
build/go: Set correct GOOS for Windows.issue-72066
* 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
| -rw-r--r-- | guix/build/go-build-system.scm | 9 |
1 files 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 <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> -;;; Copyright © 2020, 2021, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020, 2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2024 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2024 Picnoir <picnoir@alternativebit.fr> @@ -175,8 +175,11 @@ dependencies, so it should be self-contained." ;; 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")) |