Merge pull request #8451 from hashicorp/f-specify-ldflags-from-env-vars

Allow specifying ldflags via env vars

Makefile

@@ -77,7 +77,7 @@ vet:
 # generate runs `go generate` to build the dynamically generated
 # source files.
 generate:
-	@which stringer ; if [ $$? -ne 0 ]; then \
+	@which stringer > /dev/null; if [ $$? -ne 0 ]; then \
 	  go get -u golang.org/x/tools/cmd/stringer; \
 	fi
 	go generate $$(go list ./... | grep -v /terraform/vendor/)

scripts/build.sh

@@ -39,7 +39,8 @@ fi
 # instruct gox to build statically linked binaries
 export CGO_ENABLED=0
 
-LD_FLAGS="-X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY}"
+# Allow LD_FLAGS to be appended during development compilations
+LD_FLAGS="-X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY} $LD_FLAGS"
 # In relase mode we don't want debug information in the binary
 if [[ -n "${TF_RELEASE}" ]]; then
     LD_FLAGS="-X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY} -s -w"