From 8e2ccd996c482c5be1e62bb2d0aad12321f89a85 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Wed, 23 Dec 2015 16:07:30 +0100 Subject: [PATCH] FIX #2271 don't build 32bits binaries for linux/osx Signed-off-by: David Gageot --- mk/build.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mk/build.mk b/mk/build.mk index 431052b09e..d4a7976e6b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -1,11 +1,15 @@ extension = $(patsubst windows,.exe,$(filter windows,$(1))) +# Valid target combinations +VALID_OS_ARCH := "[darwin/amd64][linux/amd64][windows/amd64][windows/386]" + define gocross + $(if $(findstring [$(1)/$(2)],$(VALID_OS_ARCH)), \ GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 \ $(GO) build \ -o $(PREFIX)/bin/docker-machine_$(1)-$(2)$(call extension,$(GOOS)) \ -a $(VERBOSE_GO) -tags "static_build netgo $(BUILDTAGS)" -installsuffix netgo \ - -ldflags "$(GO_LDFLAGS) -extldflags -static" $(GO_GCFLAGS) ./cmd/machine.go; + -ldflags "$(GO_LDFLAGS) -extldflags -static" $(GO_GCFLAGS) ./cmd/machine.go;) endef build-clean: