CVS commit: pkgsrc/lang/go

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May  2 20:12:34 UTC 2020

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

Log Message:
go/bootstrap.mk: depend on lang/go-bin on {Linux,NetBSD}-*-aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/go/bootstrap.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/bootstrap.mk
diff -u pkgsrc/lang/go/bootstrap.mk:1.3 pkgsrc/lang/go/bootstrap.mk:1.4
--- pkgsrc/lang/go/bootstrap.mk:1.3     Fri May  1 16:55:28 2020
+++ pkgsrc/lang/go/bootstrap.mk Sat May  2 20:12:34 2020
@@ -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