commit c31429ed1f07ce5bcfffc5aaae14f46b5b68517c
author James Tucker <raggi@google.com> Mon Mar 20 17:04:17 2017 -0700
committer James Tucker <raggi@google.com> Tue Mar 21 18:30:06 2017 +0000
tree 87d2b4c4a42306ad9414e9f9060181c446a78dd3
parent 2417c32e0668339ca5601b16b1b226664ed07ddb

env.sh: use bundled go environment on hosts

I added the goroot/bin dir to $PATH and the GOPATH in out to $GOPATH.
this makes general go development using both GOOS=fuchsia and GOOS=host
a little more consistent & convenient.

Change-Id: I6bc4de3518b7144801371385449b99d01161f69b

env.sh

diff --git a/env.sh b/env.sh
index 0a92f59..3cd5471 100644
--- a/env.sh
+++ b/env.sh
@@ -132,6 +132,8 @@
 
   # add tools to path, removing prior tools directory if any
   export PATH="${PATH//:${MAGENTA_DIR}\/build-*\/tools}:${MAGENTA_TOOLS_DIR}"
+  # add go tools to path, removing any prior repeated entry
+  export PATH="${FUCHSIA_DIR}/third_party/go/bin:${PATH//${FUCHSIA_DIR}\/third_party\/go\/bin:}"
 }
 
 ### mcheck: checks whether mset was run
@@ -390,6 +392,7 @@
   done
 
   export FUCHSIA_BUILD_DIR="${FUCHSIA_OUT_DIR}/${FUCHSIA_VARIANT}-${FUCHSIA_GEN_TARGET}"
+  export GOPATH="$FUCHSIA_BUILD_DIR"
   export FUCHSIA_BUILD_NINJA="${FUCHSIA_BUILD_DIR}/build.ninja"
   export FUCHSIA_GEN_ARGS_CACHE="${FUCHSIA_BUILD_DIR}/build.gen-args"
   export FUCHSIA_SYSROOT_DIR="${FUCHSIA_OUT_DIR}/sysroot/${FUCHSIA_SYSROOT_TARGET}-fuchsia"