Skip to content

Commit dbe557c

Browse files
committed
Make it work with Go 1.5
1 parent 5ad1c05 commit dbe557c

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SHA := $(shell git rev-parse --short HEAD)
22
DATE := $(shell TZ=UTC date +%FT%T)Z
3-
VERSION := "$(shell cat VERSION) $(DATE) $(SHA)"
3+
VERSION := $(shell cat VERSION)-$(DATE)-$(SHA)
44

55
RELEASES=release/imgdiff-darwin-amd64 \
66
release/imgdiff-darwin-386 \
@@ -10,7 +10,7 @@ RELEASES=release/imgdiff-darwin-amd64 \
1010
release/imgdiff-windows-386.exe
1111

1212
SRCS=./cmd/imgdiff/*.go
13-
LDFLAGS=-ldflags '-X main.version $(VERSION)'
13+
LDFLAGS=-ldflags "-X main.version=$(VERSION)"
1414

1515
imgdiff: $(SRCS)
1616
go build -o imgdiff $(LDFLAGS) $(SRCS)
@@ -28,27 +28,21 @@ deps:
2828
release: $(RELEASES)
2929

3030
release/imgdiff-darwin-amd64: $(SRCS)
31-
cd $(GOROOT)/src && GOOS=darwin GOARCH=amd64 ./make.bash
3231
GOOS=darwin GOARCH=amd64 go build -o $@ $(LDFLAGS) $(SRCS)
3332

3433
release/imgdiff-darwin-386: $(SRCS)
35-
cd $(GOROOT)/src && GOOS=darwin GOARCH=386 ./make.bash
3634
GOOS=darwin GOARCH=386 go build -o $@ $(LDFLAGS) $(SRCS)
3735

3836
release/imgdiff-linux-amd64: $(SRCS)
39-
cd $(GOROOT)/src && GOOS=linux GOARCH=amd64 ./make.bash
4037
GOOS=linux GOARCH=amd64 go build -o $@ $(LDFLAGS) $(SRCS)
4138

4239
release/imgdiff-linux-386: $(SRCS)
43-
cd $(GOROOT)/src && GOOS=linux GOARCH=386 ./make.bash
4440
GOOS=linux GOARCH=386 go build -o $@ $(LDFLAGS) $(SRCS)
4541

4642
release/imgdiff-windows-amd64.exe: $(SRCS)
47-
cd $(GOROOT)/src && GOOS=windows GOARCH=amd64 ./make.bash
4843
GOOS=windows GOARCH=amd64 go build -o $@ $(LDFLAGS) $(SRCS)
4944

5045
release/imgdiff-windows-386.exe: $(SRCS)
51-
cd $(GOROOT)/src && GOOS=windows GOARCH=386 ./make.bash
5246
GOOS=windows GOARCH=386 go build -o $@ $(LDFLAGS) $(SRCS)
5347

5448
clean:

0 commit comments

Comments
 (0)