From fdee07aadc1b5224a540c7e8893144207e1979cb Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Thu, 5 Oct 2017 13:38:19 +0000 Subject: runc: Don't override GOARCH or GOROOT These variables are now set correctly by go.bbclass in oe-core. Changing them to point at the native sysroot just leads to build errors in some cases, for example when the target and host have matching GOARCH but not matching c libraries. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- recipes-containers/runc/runc.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index 83d5f863..b1f2ba87 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc @@ -21,8 +21,6 @@ EXTRA_OEMAKE="BUILDTAGS=''" inherit goarch do_compile() { - export GOARCH="${TARGET_GOARCH}" - export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" # Set GOPATH. See 'PACKAGERS.md'. Don't rely on # docker to download its dependencies but rather # use dependencies packaged independently. @@ -34,7 +32,6 @@ do_compile() { (cd .gopath/src/${dname}; ln -sf ../../../../../${bname} ${bname}) export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" - export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" # Fix up symlink for go-cross compiler rm -f ${S}/src/import/vendor/src -- cgit v1.2.3-54-g00ecf