1 files changed, 9 insertions, 1 deletions

diff --git a/recipes-devtools/go-cross/go-cross.inc b/recipes-devtools/go-cross/go-cross.inc
index 613e9c7c..6363a789 100644
--- a/recipes-devtools/go-cross/go-cross.inc
+++ b/recipes-devtools/go-cross/go-cross.inc
@@ -2,6 +2,10 @@ inherit cross
 
 DEPENDS += "go-native"
 
+# Prevent runstrip from running because you get errors when the host arch != target arch
+#INHIBIT_PACKAGE_STRIP = "1"
+STRIP = "echo"
+
 export GOHOSTOS = "${BUILD_GOOS}"
 export GOHOSTARCH = "${BUILD_GOARCH}"
 export GOOS = "${TARGET_GOOS}"
@@ -26,6 +30,8 @@ do_compile() {
 
     cd src
     ./make.bash --host-only
+    # Ensure cgo.a is built with the target toolchain
+    GO_FLAGS="-a" ./make.bash --target-only
 }
 
 do_install() {
@@ -38,7 +44,9 @@ do_install() {
     install -d ${D}${bindir}
     for f in ${B}/bin/*
     do
-        install -m755 $f ${D}${bindir}
+        if [ ! -d "$f" ] ; then
+            install -m755 $f ${D}${bindir}
+        fi
     done
 }