aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2015-10-28 18:25:35 +0800
committerPéter Szilágyi <peterke@gmail.com>2015-10-28 18:31:20 +0800
commit04f8d05bd47a715bfff7f637f5b7d35f087fb004 (patch)
tree9ab6c3900b2fec230fbf0c0b5983eddb0107968b
parent05f74077fb1bc23937f3b25fd4e826dcf5789212 (diff)
downloaddexon-04f8d05bd47a715bfff7f637f5b7d35f087fb004.tar
dexon-04f8d05bd47a715bfff7f637f5b7d35f087fb004.tar.gz
dexon-04f8d05bd47a715bfff7f637f5b7d35f087fb004.tar.bz2
dexon-04f8d05bd47a715bfff7f637f5b7d35f087fb004.tar.lz
dexon-04f8d05bd47a715bfff7f637f5b7d35f087fb004.tar.xz
dexon-04f8d05bd47a715bfff7f637f5b7d35f087fb004.tar.zst
dexon-04f8d05bd47a715bfff7f637f5b7d35f087fb004.zip
makefile: fix evm ld flags, pass them to xgo too
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 56f250a92..1bd0f9eb3 100644
--- a/Makefile
+++ b/Makefile
@@ -15,29 +15,30 @@ geth-cross: geth-linux geth-darwin geth-windows geth-android
@ls -l $(GOBIN)/geth-*
geth-linux: xgo
- build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=linux/* -v ./cmd/geth
+ build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=linux/* -v $(shell build/flags.sh) ./cmd/geth
@echo "Linux cross compilation done:"
@ls -l $(GOBIN)/geth-linux-*
geth-darwin: xgo
- build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=darwin/* -v ./cmd/geth
+ build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=darwin/* -v $(shell build/flags.sh) ./cmd/geth
@echo "Darwin cross compilation done:"
@ls -l $(GOBIN)/geth-darwin-*
geth-windows: xgo
- build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=windows/* -v ./cmd/geth
+ build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=windows/* -v $(shell build/flags.sh) ./cmd/geth
@echo "Windows cross compilation done:"
@ls -l $(GOBIN)/geth-windows-*
geth-android: xgo
- build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=android-16/*,android-21/* -v ./cmd/geth
+ build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=android-16/*,android-21/* -v $(shell build/flags.sh) ./cmd/geth
@echo "Android cross compilation done:"
@ls -l $(GOBIN)/geth-android-*
evm:
- build/env.sh $(GOROOT)/bin/go install -v $(shell build/ldflags.sh) ./cmd/evm
+ build/env.sh $(GOROOT)/bin/go install -v $(shell build/flags.sh) ./cmd/evm
@echo "Done building."
@echo "Run \"$(GOBIN)/evm to start the evm."
+
mist:
build/env.sh go install -v $(shell build/flags.sh) ./cmd/mist
@echo "Done building."