aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-05-09 16:12:28 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-05-09 16:12:28 +0800
commit8aa4597c9e3f809f1e17f3d6922b865d6e13ec4d (patch)
tree53d3b4b96eff11ad3480aa14f0ab882256c176ce
parent57ba1824ac2f343ace4d9c38a654b3a03a2fee27 (diff)
parent6a00a3ade157a08b36af304ae11849fa7f9fe6e7 (diff)
downloaddexon-8aa4597c9e3f809f1e17f3d6922b865d6e13ec4d.tar
dexon-8aa4597c9e3f809f1e17f3d6922b865d6e13ec4d.tar.gz
dexon-8aa4597c9e3f809f1e17f3d6922b865d6e13ec4d.tar.bz2
dexon-8aa4597c9e3f809f1e17f3d6922b865d6e13ec4d.tar.lz
dexon-8aa4597c9e3f809f1e17f3d6922b865d6e13ec4d.tar.xz
dexon-8aa4597c9e3f809f1e17f3d6922b865d6e13ec4d.tar.zst
dexon-8aa4597c9e3f809f1e17f3d6922b865d6e13ec4d.zip
Merge pull request #2520 from karalabe/makefile-cross-update
Makefile: go build instead of install (solves cross compile issues)
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2b553299f..c2fb9bb35 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ GOBIN = build/bin
GO ?= latest
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 "Run \"$(GOBIN)/geth\" to launch geth."
@@ -103,7 +103,9 @@ evm:
@echo "Run \"$(GOBIN)/evm to start the evm."
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
build/env.sh go test ./...