Merge pull request #2520 from karalabe/makefile-cross-update

Makefile: go build instead of install (solves cross compile issues)
This commit is contained in:
Péter Szilágyi 2016-05-09 11:12:28 +03:00
commit 8aa4597c9e

View File

@ -13,7 +13,7 @@ GOBIN = build/bin
GO ?= latest GO ?= latest
geth: geth:
build/env.sh go install -v $(shell build/flags.sh) ./cmd/geth build/env.sh go build -i -v $(shell build/flags.sh) -o $(GOBIN)/geth ./cmd/geth
@echo "Done building." @echo "Done building."
@echo "Run \"$(GOBIN)/geth\" to launch geth." @echo "Run \"$(GOBIN)/geth\" to launch geth."
@ -103,7 +103,9 @@ evm:
@echo "Run \"$(GOBIN)/evm to start the evm." @echo "Run \"$(GOBIN)/evm to start the evm."
all: all:
build/env.sh go install -v $(shell build/flags.sh) ./... for cmd in `ls ./cmd/`; do \
build/env.sh go build -i -v $(shell build/flags.sh) -o $(GOBIN)/$$cmd ./cmd/$$cmd; \
done
test: all test: all
build/env.sh go test ./... build/env.sh go test ./...