commit 33f71ec71952435866e4341cc4ed805d5eab9897
author Colin Patrick Mccabe <cmccabe@cloudera.com> Thu Jul 30 11:27:46 2015 -0700
committer Colin Patrick Mccabe <cmccabe@cloudera.com> Thu Jul 30 11:27:46 2015 -0700
tree 1ca43600d6d11650ac86cbb6de5f907982cccf02
parent 959a6ef03fec92865bab493bac2a5f20b882fdde

HTRACE-223. gobuild.sh: fix issue where maven succeeds if go build fails (cmccabe)

htrace-htraced/go/gobuild.sh

diff --git a/htrace-htraced/go/gobuild.sh b/htrace-htraced/go/gobuild.sh
index e2b658f..a614ef4 100755
--- a/htrace-htraced/go/gobuild.sh
+++ b/htrace-htraced/go/gobuild.sh
@@ -80,8 +80,8 @@
 # Check for libleveldb.so
 if [ -n "$LEVELDB_PREFIX" ]; then
     echo "using LEVELDB_PREFIX=$LEVELDB_PREFIX"
-    export CGO_CFLAGS="-I${LEVELDB_PREFIX}/include"
-    export CGO_LDFLAGS="-L${LEVELDB_PREFIX}"
+    export CGO_CFLAGS="-I${LEVELDB_PREFIX} -I${LEVELDB_PREFIX}/include"
+    export CGO_LDFLAGS="-L${LEVELDB_PREFIX} -L${LEVELDB_PREFIX}/lib"
 else
     if [ -x "/sbin/ldconfig" ]; then
         # Suse requires ldconfig to be run via the absolute path
@@ -123,7 +123,8 @@
 
     # Inject the release and git version into the htraced ldflags.
     FLAGS="-X main.RELEASE_VERSION ${RELEASE_VERSION} -X main.GIT_VERSION ${GIT_VERSION}"
-    go install ${TAGS} -ldflags "${FLAGS}" -v org/apache/htrace/... "$@"
+    go install ${TAGS} -ldflags "${FLAGS}" -v org/apache/htrace/... "$@" \
+        || die "go install failed."
     # Make a symlink to web src dir so can do development in-situ out
     # of build dir. This is ugly but blame go build.
     ln -fs "../../htrace-webapp/src/main/web" "${GOBIN}/../"