From 099c65aa00cc777c8c649c64064be83130ce9ab6 Mon Sep 17 00:00:00 2001
From: Dale Larson <dale.l.larson@jci.com>
Date: Wed, 7 Dec 2016 13:45:51 -0600
Subject: [PATCH 1/2] Fix cgo toolchain path error when on target platform.

The path to the gcc and g++ compilers had the yocto build system's
paths rather than a target system path baked into the tools.
This caused broken builds for native code on the target device.
The compile task for the recipe added the package's workspace to
PATH and used explicit paths to the compilers to the batch files
that wrapped access to the tools.
---
 recipes-devtools/go/go.inc      |  5 ++++-
 recipes-devtools/go/go_1.6.3.bb | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 recipes-devtools/go/go.inc
 mode change 100644 => 100755 recipes-devtools/go/go_1.6.3.bb

diff --git a/recipes-devtools/go/go.inc b/recipes-devtools/go/go.inc
old mode 100644
new mode 100755
index 8dae6ab..b2a00f6
--- a/recipes-devtools/go/go.inc
+++ b/recipes-devtools/go/go.inc
@@ -52,12 +52,15 @@ setup_go_arch() {
 }
 
 setup_cgo_gcc_wrapper() {
+  sdkpathnative=${7:-${SDKPATHNATIVE}}
+  bindir=${5:-${bindir_nativesdk}}
+
   # Is there a bug in the cross-compiler support for CGO? Can't get it
   # to work without this wrapper
   for t in gcc g++ ; do
     cat > ${WORKDIR}/${TARGET_PREFIX}${t} <<EOT
 #!/bin/sh
-exec ${TARGET_PREFIX}${t} ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET} "\$@"
+exec ${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}${t} ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET} "\$@"
 EOT
     chmod +x ${WORKDIR}/${TARGET_PREFIX}${t}
   done
diff --git a/recipes-devtools/go/go_1.6.3.bb b/recipes-devtools/go/go_1.6.3.bb
old mode 100644
new mode 100755
index b53ae58..56d9778
--- a/recipes-devtools/go/go_1.6.3.bb
+++ b/recipes-devtools/go/go_1.6.3.bb
@@ -1,5 +1,7 @@
 require go_${PV}.inc
 
+PR = "r5"
+
 PN_class-native = "go-native"
 PN_class-cross = "go-cross"
 
@@ -18,11 +20,13 @@ do_compile() {
 
   setup_cgo_gcc_wrapper
 
+  ## Add WORKDIR to path.
+  export PATH="${WORKDIR}/:$PATH"
   ## TODO: consider setting GO_EXTLINK_ENABLED
   export CGO_ENABLED="${GO_CROSS_CGO_ENABLED}"
   export CC=${BUILD_CC}
-  export CC_FOR_TARGET="${WORKDIR}/${TARGET_PREFIX}gcc"
-  export CXX_FOR_TARGET="${WORKDIR}/${TARGET_PREFIX}g++"
+  export CC_FOR_TARGET="${TARGET_PREFIX}gcc"
+  export CXX_FOR_TARGET="${TARGET_PREFIX}g++"
   export GO_GCFLAGS="${HOST_CFLAGS}"
   export GO_LDFLAGS="${HOST_LDFLAGS}"
 
@@ -34,6 +38,7 @@ do_compile() {
 }
 
 go_install() {
+  
   install -d "${D}${bindir}" "${D}${GOROOT_FINAL}"
   tar -C "${WORKDIR}/go-${PV}/go" -cf - bin lib src pkg test |
   tar -C "${D}${GOROOT_FINAL}" -xf -
@@ -46,7 +51,7 @@ go_install() {
   for t in gcc g++ ; do
     cat > ${D}${GOROOT_FINAL}/bin/${TARGET_PREFIX}${t} <<EOT
 #!/bin/sh
-exec ${TARGET_PREFIX}${t} ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET} "\$@"
+exec {TARGET_PREFIX}${t} ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET} "\$@"
 EOT
     chmod +x ${D}${GOROOT_FINAL}/bin/${TARGET_PREFIX}${t}
   done

From 1c57908115a72cdf4e4cc45fc57c418d39d9b956 Mon Sep 17 00:00:00 2001
From: Dale Larson <dlarson42@gmail.com>
Date: Wed, 14 Dec 2016 18:57:23 -0600
Subject: [PATCH 2/2] Update go_1.6.3.bb

---
 recipes-devtools/go/go_1.6.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/go/go_1.6.3.bb b/recipes-devtools/go/go_1.6.3.bb
index 56d9778..11b0c01 100755
--- a/recipes-devtools/go/go_1.6.3.bb
+++ b/recipes-devtools/go/go_1.6.3.bb
@@ -51,7 +51,7 @@ go_install() {
   for t in gcc g++ ; do
     cat > ${D}${GOROOT_FINAL}/bin/${TARGET_PREFIX}${t} <<EOT
 #!/bin/sh
-exec {TARGET_PREFIX}${t} ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET} "\$@"
+exec ${TARGET_PREFIX}${t} ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET} "\$@"
 EOT
     chmod +x ${D}${GOROOT_FINAL}/bin/${TARGET_PREFIX}${t}
   done