Skip to content

Commit a39a573

Browse files
committed
Fix ordering of platforms and set default to linux
1 parent ce8448d commit a39a573

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
REPO := quay.io/boson/faas
22
BIN := faas
33

4-
WINDOWS=$(BIN)_windows_amd64.exe
5-
LINUX=$(BIN)_linux_amd64
64
DARWIN=$(BIN)_darwin_amd64
5+
LINUX=$(BIN)_linux_amd64
6+
WINDOWS=$(BIN)_windows_amd64.exe
77

88
CODE := $(shell find . -name '*.go')
99
DATE := $(shell date -u +"%Y%m%dT%H%M%SZ")
1010
HASH := $(shell git rev-parse --short HEAD 2>/dev/null)
1111
VTAG := $(shell git tag --points-at HEAD)
1212
VERS := $(shell [ -z $(VTAG) ] && echo 'tip' || echo $(VTAG) )
1313

14-
all: $(WINDOWS) $(LINUX) $(DARWIN)
1514
build: all
15+
all: $(LINUX)
16+
cross-platform: $(DARWIN) $(LINUX) $(WINDOWS)
1617

17-
18-
windows: $(WINDOWS) ## Build for Windows
18+
darwin: $(DARWIN) ## Build for Darwin (macOS)
1919

2020
linux: $(LINUX) ## Build for Linux
2121

22-
darwin: $(DARWIN) ## Build for Darwin (macOS)
22+
windows: $(WINDOWS) ## Build for Windows
2323

24-
$(WINDOWS):
25-
env GOOS=windows GOARCH=amd64 go build -i -v -o $(WINDOWS) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
24+
$(DARWIN):
25+
env GOOS=darwin GOARCH=amd64 go build -v -o $(DARWIN) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
2626

2727
$(LINUX):
28-
env GOOS=linux GOARCH=amd64 go build -i -v -o $(LINUX) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
28+
env GOOS=linux GOARCH=amd64 go build -v -o $(LINUX) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
2929

30-
$(DARWIN):
31-
env GOOS=darwin GOARCH=amd64 go build -i -v -o $(DARWIN) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
30+
$(WINDOWS):
31+
env GOOS=windows GOARCH=amd64 go build -v -o $(WINDOWS) -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)
3232

3333
# $(BIN): $(CODE)
3434
# go build -ldflags "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.hash=$(HASH)" ./cmd/$(BIN)

0 commit comments

Comments
 (0)