Merge pull request #70 from liamg/fix-ldflags-makefile

Fix ldflags in makefile
This commit is contained in:
Liam Galvin 2018-11-25 20:22:50 +00:00 committed by GitHub
commit c6939ea94c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions

View File

@ -5,7 +5,7 @@ FONTPATH := ./gui/packed-fonts
.PHONY: build .PHONY: build
build: test install-tools build: test install-tools
packr -v packr -v
go build go build -ldflags "-X github.com/liamg/aminal/version.Version=`git describe --tags`"
.PHONY: test .PHONY: test
test: test:
@ -13,8 +13,9 @@ test:
go vet -v go vet -v
.PHONY: install .PHONY: install
install: build install: build install-tools
install -m 0755 aminal "${GOBIN}/${BINARY}" packr -v
go install -ldflags "-X github.com/liamg/aminal/version.Version=`git describe --tags`"
.PHONY: install-tools .PHONY: install-tools
install-tools: install-tools:
@ -30,12 +31,12 @@ update-fonts: install-tools
.PHONY: build-linux .PHONY: build-linux
build-linux: build-linux:
mkdir -p bin/linux mkdir -p bin/linux
GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -o bin/linux/${BINARY}-linux-amd64 -ldflags "-X version.Version='${CIRCLE_TAG}'" GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -o bin/linux/${BINARY}-linux-amd64 -ldflags "-X github.com/liamg/aminal/version.Version=${CIRCLE_TAG}"
.PHONY: build-darwin .PHONY: build-darwin
build-darwin: build-darwin:
mkdir -p bin/darwin mkdir -p bin/darwin
xgo -x -v -ldflags "-X version.Version='${CIRCLE_TAG}'" --targets=darwin/amd64 -out bin/darwin/${BINARY} . xgo -x -v -ldflags "-X github.com/liamg/aminal/version.Version=${CIRCLE_TAG}" --targets=darwin/amd64 -out bin/darwin/${BINARY} .
.PHONY: package-debian .PHONY: package-debian
package-debian: build-linux package-debian: build-linux