From 469f6992140122c2ebb81ac7ff367d050a15eacb Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 8 Oct 2017 20:11:17 +0200 Subject: [PATCH] go: fix build using ubuntu golang-go --- packages/addons/addon-depends/go/package.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index 627fc20550..fb99e7005c 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -44,7 +44,11 @@ PKG_AUTORECONF="no" configure_host() { export GOOS=linux export GOROOT_FINAL=$TOOLCHAIN/lib/golang - export GOROOT_BOOTSTRAP=/usr/lib/golang + if [ -x /usr/lib/go/bin/go ]; then + export GOROOT_BOOTSTRAP=/usr/lib/go + else + export GOROOT_BOOTSTRAP=/usr/lib/golang + fi export GOARCH=amd64 }