From 4049d2b859256eb1bb8476e9477df6ead2b95686 Mon Sep 17 00:00:00 2001
From: bsiegert <bsiegert@pkgsrc.org>
Date: Sat, 20 Mar 2021 09:26:11 +0000
Subject: Use Go 1.16 as the default version.

macOS on ARM has had 1.16 as the default already for a while. The next
branch should have it for all OSes. Some build breakage has been fixed
already in separate commits.

ok before freeze wiz@
---
 lang/go/version.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lang/go')

diff --git a/lang/go/version.mk b/lang/go/version.mk
index 5b08a5b5552..0c4a3c7e464 100644
--- a/lang/go/version.mk
+++ b/lang/go/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.114 2021/03/19 17:22:54 bsiegert Exp $
+# $NetBSD: version.mk,v 1.115 2021/03/20 09:26:11 bsiegert Exp $
 
 #
 # If bsd.prefs.mk is included before go-package.mk in a package, then this
@@ -19,15 +19,13 @@ GO14_VERSION=	1.4.3
 .if ${OPSYS} == "NetBSD" && ${OS_VERSION:M6.*}
 # 1.9 is the last Go version to support NetBSD 6
 GO_VERSION_DEFAULT?=	19
-.elif ${OPSYS} == "Darwin" && ${MACHINE_ARCH} == "aarch64"
-GO_VERSION_DEFAULT?=	116
 .elif ${OPSYS} == "Darwin" && ${OS_VERSION:R} < 14
 # go 1.11 removed support for osx 10.8 and 10.9
 # https://github.com/golang/go/issues/23122
 # darwin version 13.4 is osx 10.9.5
 GO_VERSION_DEFAULT?=	110
 .else
-GO_VERSION_DEFAULT?=	115
+GO_VERSION_DEFAULT?=	116
 .endif
 
 .if !empty(GO_VERSION_DEFAULT)
-- 
cgit v1.2.3