From cd62281de68de86509d4f97e9e240946a43ea4cc Mon Sep 17 00:00:00 2001
From: tnn <tnn@pkgsrc.org>
Date: Sat, 2 May 2020 20:12:34 +0000
Subject: go/bootstrap.mk: depend on lang/go-bin on {Linux,NetBSD}-*-aarch64

---
 lang/go/bootstrap.mk | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'lang/go')

diff --git a/lang/go/bootstrap.mk b/lang/go/bootstrap.mk
index c80211416a3..dbee5cee2a7 100644
--- a/lang/go/bootstrap.mk
+++ b/lang/go/bootstrap.mk
@@ -1,19 +1,12 @@
-# $NetBSD: bootstrap.mk,v 1.3 2020/05/01 16:55:28 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.4 2020/05/02 20:12:34 tnn Exp $
 
 .if !defined(GOROOT_BOOTSTRAP) || !exists(${GOROOT_BOOTSTRAP}/bin/go)
+.  if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) ||	\
+	!empty(MACHINE_PLATFORM:MLinux-*-aarch64)
+BUILD_DEPENDS+=		go-bin-[0-9]*:../../lang/go-bin
+GOROOT_BOOTSTRAP=	${PREFIX}/go-bin
+.  else
 BUILD_DEPENDS+=		go14-1.4*:../../lang/go14
 GOROOT_BOOTSTRAP=	${PREFIX}/go14
-
-.  if ${MACHINE_ARCH} == "aarch64"
-PKG_FAIL_REASON+=	"${MACHINE_ARCH} bootstrap toolchain missing!"
-PKG_FAIL_REASON+=	"Please read ${PKGSRCDIR}/lang/go/bootstrap.mk"
-# For now you must manually set GOROOT_BOOTSTRAP in mk.conf.
-# I've uploaded a prebuilt NetBSD/evbarm-aarch64 pkgsrc package here:
-# https://ftp.netbsd.org/pub/pkgsrc/misc/tnn/golang-aarch64/
-#
-# Also this kernel patch is needed:
-# https://netbsd.org/~tnn/uc_setstack.diff.txt
-#
 .  endif
-
 .endif
-- 
cgit v1.2.3