Merge pull request #1734 from fjl/ldflags-warning-go1.5
build: avoid -X separator warning with Go >= 1.5
This commit is contained in:
		@@ -7,7 +7,12 @@ if [ ! -f "build/env.sh" ]; then
 | 
				
			|||||||
    exit 2
 | 
					    exit 2
 | 
				
			||||||
fi
 | 
					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.
 | 
					# set gitCommit when running from a Git checkout.
 | 
				
			||||||
if [ -f ".git/HEAD" ]; then
 | 
					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
 | 
					fi
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user