From 684a2b2d64c7e270402f8a958132f6f879f59cf2 Mon Sep 17 00:00:00 2001 From: Arthur Liberman Date: Wed, 26 Apr 2023 21:02:35 +0300 Subject: [PATCH] go: add support for /usr/local host installations fix build when compiling on arm/aarch64 --- packages/addons/addon-depends/go/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index 7b61b0b0d6..7dafc7e6f7 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -13,14 +13,14 @@ PKG_LONGDESC="An programming language that makes it easy to build simple, reliab PKG_TOOLCHAIN="manual" configure_host() { - export GOOS=linux export GOROOT_FINAL=${TOOLCHAIN}/lib/golang - if [ -x /usr/lib/go/bin/go ]; then + if [ -x /usr/local/go/bin/go ]; then + export GOROOT_BOOTSTRAP=/usr/local/go + elif [ -x /usr/lib/go/bin/go ]; then export GOROOT_BOOTSTRAP=/usr/lib/go else export GOROOT_BOOTSTRAP=/usr/lib/golang fi - export GOARCH=amd64 if [ ! -d ${GOROOT_BOOTSTRAP} ]; then cat <