diff options
| author | Felix Lange <fjl@twurst.com> | 2015-08-31 20:49:50 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-08-31 20:49:50 +0800 |
| commit | 1801748ccd3486f757329e7f23ca4c6c8887f327 (patch) | |
| tree | e64ef9d321867b180acb817e51bdeca424670fee | |
| parent | e1037bd0cfd6a19ef8612672ba192a8923e88d96 (diff) | |
| parent | cfd84a6ad9dee2eccf34e312d32cbfb95d360afe (diff) | |
| download | go-tangerine-1801748ccd3486f757329e7f23ca4c6c8887f327.tar go-tangerine-1801748ccd3486f757329e7f23ca4c6c8887f327.tar.gz go-tangerine-1801748ccd3486f757329e7f23ca4c6c8887f327.tar.bz2 go-tangerine-1801748ccd3486f757329e7f23ca4c6c8887f327.tar.lz go-tangerine-1801748ccd3486f757329e7f23ca4c6c8887f327.tar.xz go-tangerine-1801748ccd3486f757329e7f23ca4c6c8887f327.tar.zst go-tangerine-1801748ccd3486f757329e7f23ca4c6c8887f327.zip | |
Merge pull request #1734 from fjl/ldflags-warning-go1.5
build: avoid -X separator warning with Go >= 1.5
| -rwxr-xr-x | build/ldflags.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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 |