From e9d74162a9bfdbf0a51f230ad9bedeab920552f4 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 5 Apr 2018 10:52:08 -0400 Subject: runc: ensure that ${GO} is exported build/make The runc makefile now uses $(GO) universally, but sets the variable as GO := go by default. This means that the host go will be used instead of our recipe sysroot variant. A simple export of the variable is not enough in all cases (due to Make assignments), so both export it AND pass it directly to the oe_make call. This fixes docker-runc builds on ARM64. Signed-off-by: Bruce Ashfield --- recipes-containers/runc/runc.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index 01791030..ec017225 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc @@ -11,6 +11,8 @@ S = "${WORKDIR}/git" PV = "${RUNC_VERSION}+git${SRCPV}" inherit go +inherit goarch + RRECOMMENDS_${PN} = "lxc docker" PROVIDES += "virtual/runc" RPROVIDES_${PN} = "virtual/runc" @@ -20,7 +22,7 @@ GO_IMPORT = "import" LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer" do_configure[noexec] = "1" -EXTRA_OEMAKE="BUILDTAGS=''" +EXTRA_OEMAKE="BUILDTAGS='' GO=${GO}" do_compile() { # Set GOPATH. See 'PACKAGERS.md'. Don't rely on @@ -44,6 +46,8 @@ do_compile() { export CGO_ENABLED="1" export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export GO=${GO} + export CFLAGS="" export LDFLAGS="" -- cgit v1.2.3-54-g00ecf