Merge pull request #633 from adamreese/fix/building

ref(Makefile): use GOBIN for go builds
pull/635/head
Adam Reese 8 years ago
commit fc9171f8cc

@ -12,18 +12,16 @@ TESTS := .
TESTFLAGS := TESTFLAGS :=
LDFLAGS := LDFLAGS :=
GOFLAGS := GOFLAGS :=
BINDIR := ./bin BINDIR := $(CURDIR)/bin
BINARIES := helm tiller BINARIES := helm tiller
.PHONY: all .PHONY: all
all: build all: build
.PHONY: build .PHONY: build
build: GOFLAGS += -i docker-binary: GOFLAGS += -i
build: build:
@for i in $(BINARIES); do \ GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' github.com/kubernetes/helm/cmd/...
CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO) build -o $(BINDIR)/$$i $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/$$i || exit 1; \
done
.PHONY: check-docker .PHONY: check-docker
check-docker: check-docker:
@ -35,7 +33,7 @@ check-docker:
.PHONY: docker-binary .PHONY: docker-binary
docker-binary: GOOS = linux docker-binary: GOOS = linux
docker-binary: GOARCH = amd64 docker-binary: GOARCH = amd64
docker-binary: BINDIR = ./rootfs docker-binary: BINDIR = $(CURDIR)/rootfs
docker-binary: GOFLAGS += -a -installsuffix cgo docker-binary: GOFLAGS += -a -installsuffix cgo
docker-binary: build docker-binary: build

Loading…
Cancel
Save