6 files changed, 6 insertions, 6 deletions

diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index b8181c7a..07920b9f 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -23,7 +23,7 @@ EXTRA_OEMAKE="BUILDTAGS=''"
 do_compile() {
         export GOARCH="${TARGET_GOARCH}"
         export GOPATH="${WORKDIR}/git/"
-
+        export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
         # Pass the needed cflags/ldflags so that cgo
         # can find the needed headers files and libraries
         export CGO_ENABLED="1"
diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
index 49375b7f..125362bb 100644
--- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
+++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
@@ -27,7 +27,7 @@ EXTRA_OEMAKE="BUILDTAGS=''"
 
 do_compile() {
         export GOARCH="${TARGET_GOARCH}"
-
+        export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
         # Setup vendor directory so that it can be used in GOPATH.
         #
         # Go looks in a src directory under any directory in GOPATH but riddler
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 a4c544d5..176860ec 100644
--- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
+++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
@@ -15,7 +15,7 @@ inherit go
 
 do_compile() {
         export GOARCH="${TARGET_GOARCH}"
-
+        export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
         export GOPATH="${S}"
 
         # Pass the needed cflags/ldflags so that cgo
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb
index a04cc3e2..51599803 100644
--- a/recipes-containers/riddler/riddler_git.bb
+++ b/recipes-containers/riddler/riddler_git.bb
@@ -18,7 +18,7 @@ EXTRA_OEMAKE="BUILDTAGS=''"
 
 do_compile() {
         export GOARCH="${TARGET_GOARCH}"
-
+        export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
         # Setup vendor directory so that it can be used in GOPATH.
         #
         # Go looks in a src directory under any directory in GOPATH but riddler
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc
index 7626dad7..64cf3f85 100644
--- a/recipes-containers/runc/runc.inc
+++ b/recipes-containers/runc/runc.inc
@@ -23,7 +23,7 @@ inherit go-osarchmap
 
 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.
diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb
index 1efcf9a6..470dfacf 100644
--- a/recipes-networking/netns/netns_git.bb
+++ b/recipes-networking/netns/netns_git.bb
@@ -14,7 +14,7 @@ inherit go
 
 do_compile() {
         export GOARCH="${TARGET_GOARCH}"
-
+        export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
         # Setup vendor directory so that it can be used in GOPATH.
         #
         # Go looks in a src directory under any directory in GOPATH but netns