CVS commit: pkgsrc/lang/go

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Sep 12 12:16:06 UTC 2022

Modified Files:
        pkgsrc/lang/go: version.mk

Log Message:
go: Force GOHOSTARCH for Darwin x86_64.

Fixes builds of go118 and newer in x86_64 chroots on an arm64 host.  The go
build system parses "uname -v" and incorrectly assumes that if you're running
on an arm64 host you always want arm64 binaries.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 pkgsrc/lang/go/version.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/go/version.mk
diff -u pkgsrc/lang/go/version.mk:1.158 pkgsrc/lang/go/version.mk:1.159
--- pkgsrc/lang/go/version.mk:1.158     Wed Sep  7 06:36:32 2022
+++ pkgsrc/lang/go/version.mk   Mon Sep 12 12:16:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.158 2022/09/07 06:36:32 bsiegert Exp $
+# $NetBSD: version.mk,v 1.159 2022/09/12 12:16:05 jperkin Exp $
 
 #
 # If bsd.prefs.mk is included before go-package.mk in a package, then this
@@ -46,6 +46,10 @@ GOCHAR=                      8
 .elif ${MACHINE_ARCH} == "x86_64"
 GOARCH=                        amd64
 GOCHAR=                        6
+# go118 hardcodes GOARCH=arm64 even when running in an x86_64 chroot
+.  if ${OPSYS} == "Darwin"
+GOOPT+=                        GOHOSTARCH=amd64
+.  endif
 .elif ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf"
 GOARCH=                        arm
 GOCHAR=                        5