diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-28 18:46:23 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-28 18:46:23 +0800 |
| commit | 6b5a42a15ca54749d41c0b29b4a26ebb3a1a53f0 (patch) | |
| tree | 82c459cf287d90ce7f8f34dde577392041947ba4 | |
| parent | 05f74077fb1bc23937f3b25fd4e826dcf5789212 (diff) | |
| parent | e6556262689f8003ba356436fe63fe5237449edc (diff) | |
| download | dexon-6b5a42a15ca54749d41c0b29b4a26ebb3a1a53f0.tar dexon-6b5a42a15ca54749d41c0b29b4a26ebb3a1a53f0.tar.gz dexon-6b5a42a15ca54749d41c0b29b4a26ebb3a1a53f0.tar.bz2 dexon-6b5a42a15ca54749d41c0b29b4a26ebb3a1a53f0.tar.lz dexon-6b5a42a15ca54749d41c0b29b4a26ebb3a1a53f0.tar.xz dexon-6b5a42a15ca54749d41c0b29b4a26ebb3a1a53f0.tar.zst dexon-6b5a42a15ca54749d41c0b29b4a26ebb3a1a53f0.zip | |
Merge pull request #1937 from karalabe/make-ldflags
makefile: fix evm ld flags, pass them to xgo too
| -rw-r--r-- | Makefile | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -2,7 +2,7 @@ # with Go source code. If you know what GOPATH is then you probably # don't need to bother with make. -.PHONY: geth evm mist all test travis-test-with-coverage clean +.PHONY: geth geth-cross geth-linux geth-darwin geth-windows geth-android evm all test travis-test-with-coverage xgo clean GOBIN = build/bin geth: @@ -15,33 +15,29 @@ 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." - @echo "Run \"$(GOBIN)/mist --asset_path=cmd/mist/assets\" to launch mist." all: build/env.sh go install -v $(shell build/flags.sh) ./... |