diff options
| author |  Martin Wicke <wicke@google.com> | 2017-03-23 12:31:16 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-03-23 13:44:29 -0700 |
| commit | bc456e361d49d1d89a74b80060c70efb51fd7d87 (patch) | |
| tree | 825e04287f1e2d2ac098ca3f0fdd4e361aefd68c /tensorflow/go/genop | |
| parent | 8ca071456537e6c96ae8896c2a20b1f08b0e59d3 (diff) | |
Merge changes from github.
Change: 151046259
Diffstat (limited to 'tensorflow/go/genop')
| -rw-r--r-- | tensorflow/go/genop/generate.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tensorflow/go/genop/generate.sh b/tensorflow/go/genop/generate.sh index b961f7200a..d791e39c40 100644 --- a/tensorflow/go/genop/generate.sh +++ b/tensorflow/go/genop/generate.sh @@ -20,11 +20,17 @@ go get github.com/golang/protobuf/proto go get github.com/golang/protobuf/protoc-gen-go cd $(dirname $0) -TF_DIR=${GOPATH}/src/github.com/tensorflow/tensorflow -PROTOC="${TF_DIR}/bazel-out/host/bin/external/protobuf/protoc" +for g in $(echo $GOPATH | sed "s/:/ /g"); do + TF_DIR="${g}/src/github.com/tensorflow/tensorflow" + PROTOC="${TF_DIR}/bazel-out/host/bin/external/protobuf/protoc" + if [ -x "${PROTOC}" ]; then + break + fi +done if [ ! -x "${PROTOC}" ] then + set +e PATH_PROTOC=$(which protoc) if [ ! -x "${PATH_PROTOC}" ] then @@ -34,6 +40,7 @@ then exit 1 fi PROTOC=$PATH_PROTOC + set -e fi # Ensure that protoc-gen-go is available in $PATH |