From cfd84a6ad9dee2eccf34e312d32cbfb95d360afe Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 27 Aug 2015 13:23:37 +0200 Subject: build: avoid -X separator warning with Go >= 1.5 --- build/ldflags.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'build') diff --git a/build/ldflags.sh b/build/ldflags.sh index 9e17ca498..3f055d416 100755 --- a/build/ldflags.sh +++ b/build/ldflags.sh @@ -7,7 +7,12 @@ if [ ! -f "build/env.sh" ]; then exit 2 fi +# Since Go 1.5, the separator char for link time assignments +# is '=' and using ' ' prints a warning. However, Go < 1.5 does +# not support using '='. +sep=$(go version | awk '{ if ($3 >= "go1.5" || index($3, "devel")) print "="; else print " "; }' -) + # set gitCommit when running from a Git checkout. if [ -f ".git/HEAD" ]; then - echo "-ldflags '-X main.gitCommit $(git rev-parse HEAD)'" + echo "-ldflags '-X main.gitCommit$sep$(git rev-parse HEAD)'" fi -- cgit