From dd4317db434ba36c0b39c74fffee8cd6c9e0769f Mon Sep 17 00:00:00 2001 From: Mohammad Samman Date: Sun, 30 Aug 2015 03:14:23 -0700 Subject: [PATCH] build: fixed build warning to clear warning and ensure git sha linkage works in the future Fixes #3406 --- build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build b/build index bf73d38e2..56c70a3f0 100755 --- a/build +++ b/build @@ -13,6 +13,15 @@ eval $(go env) GIT_SHA=`git rev-parse --short HEAD || echo "GitNotFound"` +IFS=' ' read -a ver <<< "$(go version)" +IFS='.' read -a ver <<< ${ver[2]} +IFS=' ' read -a ver <<< ${ver} +if [[ ver[1] -gt 4 ]]; then + LINK_OPERATOR="=" +else + LINK_OPERATOR=" " +fi + # Static compilation is useful when etcd is run in a container -CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s -X ${REPO_PATH}/version.GitSHA ${GIT_SHA}" -o bin/etcd ${REPO_PATH} +CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s -X ${REPO_PATH}/version.GitSHA${LINK_OPERATOR}${GIT_SHA}" -o bin/etcd ${REPO_PATH} CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s" -o bin/etcdctl ${REPO_PATH}/etcdctl