Author: Jaret Cantu <jaret.cantu@timesys.com>
Date:   Mon Jul 27 19:36:03 EDT 2020

    Run go programs on the native architecture, not the cross target.

diff --git a/go/Makefile b/go/Makefile
index 38c1cf3..4f2a3c4 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -45,7 +45,7 @@ $(topdir)/libcap/cap_names.h:
 	$(MAKE) -C $(topdir)/libcap cap_names.h
 
 good-names.go: $(topdir)/libcap/cap_names.h vendor/$(IMPORTDIR)/cap mknames.go
-	CC="$(CC)" $(GO) run -mod=vendor mknames.go --header=$< --textdir=$(topdir)/doc/values | gofmt > $@ || rm -f $@
+	env GOARCH=$$($(GO) env GOHOSTARCH) $(GO) run mknames.go --header=$< --textdir=$(topdir)/doc/values | gofmt > $@ || rm -f $@
 	diff -u ../cap/names.go $@
 
 PSXGOPACKAGE: vendor/$(IMPORTDIR)/psx ../psx/*.go $(DEPS)
-- 
2.25.1