From 08d50052bef68686c71b5021ff53dbc41af1f945 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Sun, 12 Jun 2022 01:00:06 -0700 Subject: oci-runtime-tools: adjust GOROOT, CGO_CFLAGS and CGO_LDFALGS Adjust the GOROOT setting as directory specified by the original one does not exist. The CGO_CFLAGS and CGO_LDFLAGS should use target flags instead of the nativesdk ones. Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb index 838d24b3..0a4c9090 100644 --- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb +++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb @@ -18,7 +18,7 @@ inherit go do_compile() { export GOARCH="${TARGET_GOARCH}" - export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" + export GOROOT="${STAGING_LIBDIR}/go" export GOPATH="${S}/src/import:${S}/src/import/vendor" # Pass the needed cflags/ldflags so that cgo @@ -26,8 +26,8 @@ do_compile() { export CGO_ENABLED="1" export CFLAGS="" export LDFLAGS="" - export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" - export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CGO_CFLAGS="${TARGET_CFLAGS}" + export CGO_LDFLAGS="${TARGET_LDFLAGS}" export GO111MODULE=off # fixes: -- cgit v1.2.3-54-g00ecf