diff options
author | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-18 14:33:09 +0000 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-18 14:37:26 +0000 |
commit | e486b2b674badc80627b11077b7df2ac1cab92d8 (patch) | |
tree | 5909547a69c4b185b878c8f0fe8152f1c01fef04 /guix/build/go-build-system.scm | |
parent | 0df1eb029efe5ebe3f02e36fa650cae4aaba89ec (diff) | |
parent | 88badc074a5dbebf80115918cf6c0009075154d2 (diff) | |
download | guix-patches-e486b2b674badc80627b11077b7df2ac1cab92d8.tar guix-patches-e486b2b674badc80627b11077b7df2ac1cab92d8.tar.gz |
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'guix/build/go-build-system.scm')
-rw-r--r-- | guix/build/go-build-system.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm index 645d2fe680..4768ee8562 100644 --- a/guix/build/go-build-system.scm +++ b/guix/build/go-build-system.scm @@ -152,8 +152,10 @@ dependencies, so it should be self-contained." ;; Make sure we're building for the correct architecture and OS targets ;; that Guix targets. - (setenv "GOARCH" goarch) - (setenv "GOOS" goos) + (setenv "GOARCH" (or goarch + (getenv "GOHOSTARCH"))) + (setenv "GOOS" (or goos + (getenv "GOHOSTOS"))) (match goarch ("arm" (setenv "GOARM" "7")) |