diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-12-19 15:15:11 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-12-19 15:15:11 +0200 |
| commit | 6ccf8ea81f95963c0b7f945648106576008ee105 (patch) | |
| tree | f39f596e6c3e98ff1e9f1de0ad41c977e9dd37c1 /guix/build/go-build-system.scm | |
| parent | fcaed5b81e893f34d77527fbef389ca628ca882d (diff) | |
| parent | 9f916d14765b00309c742fcbff0cfabdd10dcf05 (diff) | |
Merge branch '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")) |