Merge pull request #1937 from karalabe/make-ldflags
makefile: fix evm ld flags, pass them to xgo too
This commit is contained in:
commit
6b5a42a15c
16
Makefile
16
Makefile
@ -2,7 +2,7 @@
|
|||||||
# with Go source code. If you know what GOPATH is then you probably
|
# with Go source code. If you know what GOPATH is then you probably
|
||||||
# don't need to bother with make.
|
# 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
|
GOBIN = build/bin
|
||||||
|
|
||||||
geth:
|
geth:
|
||||||
@ -15,33 +15,29 @@ geth-cross: geth-linux geth-darwin geth-windows geth-android
|
|||||||
@ls -l $(GOBIN)/geth-*
|
@ls -l $(GOBIN)/geth-*
|
||||||
|
|
||||||
geth-linux: xgo
|
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:"
|
@echo "Linux cross compilation done:"
|
||||||
@ls -l $(GOBIN)/geth-linux-*
|
@ls -l $(GOBIN)/geth-linux-*
|
||||||
|
|
||||||
geth-darwin: xgo
|
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:"
|
@echo "Darwin cross compilation done:"
|
||||||
@ls -l $(GOBIN)/geth-darwin-*
|
@ls -l $(GOBIN)/geth-darwin-*
|
||||||
|
|
||||||
geth-windows: xgo
|
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:"
|
@echo "Windows cross compilation done:"
|
||||||
@ls -l $(GOBIN)/geth-windows-*
|
@ls -l $(GOBIN)/geth-windows-*
|
||||||
|
|
||||||
geth-android: xgo
|
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:"
|
@echo "Android cross compilation done:"
|
||||||
@ls -l $(GOBIN)/geth-android-*
|
@ls -l $(GOBIN)/geth-android-*
|
||||||
|
|
||||||
evm:
|
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 "Done building."
|
||||||
@echo "Run \"$(GOBIN)/evm to start the evm."
|
@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:
|
all:
|
||||||
build/env.sh go install -v $(shell build/flags.sh) ./...
|
build/env.sh go install -v $(shell build/flags.sh) ./...
|
||||||
|
Loading…
Reference in New Issue
Block a user