From b223a1f4d5835a64c75f6a5678c4cc96dce4d65f Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Wed, 9 May 2018 09:31:50 -0600 Subject: go-native: use libdir_native Setting staging_libdir to libdir caused unnecessary rebuilds of go-native when switching from a multilib build to a non-multilib build. Switch to libdir_native because it doesn't change based on target configuration. Signed-off-by: Dan McGregor --- meta/recipes-devtools/go/go-native.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-devtools/go/go-native.inc b/meta/recipes-devtools/go/go-native.inc index b76fb0825e..207708745e 100644 --- a/meta/recipes-devtools/go/go-native.inc +++ b/meta/recipes-devtools/go/go-native.inc @@ -1,7 +1,3 @@ -# Use immediate assingment here to get the original (/usr/lib) -# instead of the one rewritten by native.bbclass. -nonstaging_libdir := "${libdir}" - inherit native SRC_URI_append = " https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" @@ -20,7 +16,7 @@ do_configure() { } do_compile() { - export GOROOT_FINAL="${nonstaging_libdir}/go" + export GOROOT_FINAL="${libdir_native}/go" export GOROOT_BOOTSTRAP="${WORKDIR}/go1.4/go" cd src -- cgit 1.2.3-korg