@@ -25,17 +25,19 @@ endif
25
25
26
26
# By default this list is filtered down to some common platforms.
27
27
platforms := $(subst /,-,$(shell go tool dist list | grep -e linux -e windows -e darwin | grep -e 386 -e amd64) )
28
- PLATFORM_BINS := $(patsubst % ,$(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _% /$(BINARY ) ,$(platforms ) )
28
+ PLATFORM_BINS_TMP := $(patsubst % ,$(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _% /$(BINARY ) ,$(platforms ) )
29
+ PLATFORM_BINS := $(patsubst $(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _windows-% /$(BINARY ) ,$(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _windows-% /$(BINARY ) .exe,$(PLATFORM_BINS_TMP ) )
29
30
PLATFORM_DIRS := $(patsubst % ,$(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _% ,$(platforms ) )
30
31
PLATFORM_TARS := $(patsubst % ,$(RELEASEDIR ) /$(BINARY ) _$(VERSION_SHORT ) _% .tar.gz,$(platforms ) )
31
32
32
33
# These are evaluated on use, and so will have the correct values in the build
33
34
# rule (https://vic.demuzere.be/articles/golang-makefile-crosscompile/)
34
- PLATFORMS_TEMP = $(subst -, ,$(patsubst $(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _% / $( BINARY ) ,% ,$@ ) )
35
+ PLATFORMS_TEMP = $(subst /, , $( subst -, ,$(patsubst $(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _% ,% ,$@ ) ) )
35
36
GOOS = $(word 1, $(PLATFORMS_TEMP ) )
36
37
GOARCH = $(word 2, $(PLATFORMS_TEMP ) )
37
38
38
- CURRENT_PLATFORM := $(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _$(shell go env GOOS) -$(shell go env GOARCH) /$(BINARY )
39
+ CURRENT_PLATFORM_TMP := $(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _$(shell go env GOOS) -$(shell go env GOARCH) /$(BINARY )
40
+ CURRENT_PLATFORM := $(patsubst $(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _windows-% /$(BINARY ) ,$(BINDIR ) /$(BINARY ) _$(VERSION_SHORT ) _windows-% /$(BINARY ) .exe,$(CURRENT_PLATFORM_TMP ) )
39
41
40
42
CONCURRENT_LINTERS ?=
41
43
ifeq ($(CONCURRENT_LINTERS ) ,)
0 commit comments