On 3/6/22 06:31, Jonathan Perkin wrote:
* On 2022-03-05 at 23:32 GMT, Roland Illig wrote:To get only the major version even in case of three-part version numbers, use ':R' twice, resulting in ${OSX_VERSION:R:R}.I added OPSYS_VERSION recently to avoid all this.
do-configure:
@echo ${OSX_VERSION}
@echo ${OPSYS_VERSION}
12.2
120201
This also seems to work then:
--- bootstrap.mk 14 Jul 2021 14:32:04 -0000 1.7
+++ bootstrap.mk 6 Mar 2022 13:13:45 -0000
@@ -1,7 +1,7 @@
# $NetBSD: bootstrap.mk,v 1.7 2021/07/14 14:32:04 jperkin Exp $
.if !defined(GOROOT_BOOTSTRAP) || !exists(${GOROOT_BOOTSTRAP}/bin/go)
-. if ${MACHINE_ARCH} == "aarch64"
+. if ${MACHINE_ARCH} == "aarch64" || ${OPSYS} == "Darwin" &&
${OPSYS_VERSION} >= 120000
BUILD_DEPENDS+= go-bin-[0-9]*:../../lang/go-bin
GOROOT_BOOTSTRAP= ${PREFIX}/go-bin
. else