summaryrefslogtreecommitdiffstats
path: root/recipes-containers/containerd/containerd.inc
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-04-19 16:49:41 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-04-20 10:03:50 -0400
commitfcc09c8c3639ca5c529d4f28db9b1d090331739f (patch)
treeb7bb1e0b27ef1b600508c4dfb9080269c173e84c /recipes-containers/containerd/containerd.inc
parent7d2ee2dfa266f339d57823a72560ca2fcf01bd49 (diff)
downloadmeta-virtualization-fcc09c8c3639ca5c529d4f28db9b1d090331739f.tar.gz
runc/containerd: fix build with go 1.9.x
go 1.9.x was triggering linkage errors on some build hosts due to missing symbols. | tmp/work/core2-64-poky-linux/runc-docker/1.0.0-rc5+gitAUTOINC+4fc53a81fb-r0/recipe-sysroot/usr/lib/../lib/libc.a(dl-reloc-static-pie.o): In function `elf_mac: | /usr/src/debug/glibc/2.27-r0/git/sysdeps/x86_64/dl-machine.h:59: undefined reference to `_DYNAMIC' | tmp/work/core2-64-poky-linux/runc-docker/1.0.0-rc5+gitAUTOINC+4fc53a81fb-r0/recipe-sysroot/usr/lib/../lib/libc.a(dl-reloc-static-pie.o): In function `elf_get: | /usr/src/debug/glibc/2.27-r0/git/elf/get-dynamic-info.h:48: undefined reference to `_DYNAMIC' By ensuring that our sysroot provided go binary and build flags make it into the build enviroment we can build properly with 1.9 and 1.10 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/containerd/containerd.inc')
-rw-r--r--recipes-containers/containerd/containerd.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-containers/containerd/containerd.inc b/recipes-containers/containerd/containerd.inc
index 9f66e46e..eb47cc9e 100644
--- a/recipes-containers/containerd/containerd.inc
+++ b/recipes-containers/containerd/containerd.inc
@@ -53,6 +53,8 @@ do_compile() {
53 export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" 53 export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
54 export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" 54 export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
55 export BUILDTAGS="no_btrfs static_build netgo" 55 export BUILDTAGS="no_btrfs static_build netgo"
56 export CFLAGS="${CFLAGS}"
57 export LDFLAGS="${LDFLAGS}"
56 58
57 cd ${S}/src/import 59 cd ${S}/src/import
58 oe_runmake binaries 60 oe_runmake binaries