docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2673 from dgageot/no-32bits-osx-linux 

FIX #2271 don't build 32bits binaries for linux/osx
This commit is contained in:
Jean-Laurent de Morlhon 2015-12-23 16:25:45 +01:00
parent 5bb3d901b9 8e2ccd996c
commit eeec362ba4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mk/build.mk
View File

@ -1,11 +1,15 @@
extension = $(patsubst windows,.exe,$(filter windows,$(1))) extension = $(patsubst windows,.exe,$(filter windows,$(1)))
# Valid target combinations
VALID_OS_ARCH := "[darwin/amd64][linux/amd64][windows/amd64][windows/386]"
define gocross define gocross
$(if $(findstring [$(1)/$(2)],$(VALID_OS_ARCH)), \
GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 \ GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 \
$(GO) build \ $(GO) build \
-o $(PREFIX)/bin/docker-machine_$(1)-$(2)$(call extension,$(GOOS)) \ -o $(PREFIX)/bin/docker-machine_$(1)-$(2)$(call extension,$(GOOS)) \
-a $(VERBOSE_GO) -tags "static_build netgo $(BUILDTAGS)" -installsuffix netgo \ -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 endef
build-clean: build-clean: