Skip to content

Commit 6b5a42a

Browse files
committed
Merge pull request ethereum#1937 from karalabe/make-ldflags
makefile: fix evm ld flags, pass them to xgo too
2 parents 05f7407 + e655626 commit 6b5a42a

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

Makefile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# with Go source code. If you know what GOPATH is then you probably
33
# don't need to bother with make.
44

5-
.PHONY: geth evm mist all test travis-test-with-coverage clean
5+
.PHONY: geth geth-cross geth-linux geth-darwin geth-windows geth-android evm all test travis-test-with-coverage xgo clean
66
GOBIN = build/bin
77

88
geth:
@@ -15,33 +15,29 @@ geth-cross: geth-linux geth-darwin geth-windows geth-android
1515
@ls -l $(GOBIN)/geth-*
1616

1717
geth-linux: xgo
18-
build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=linux/* -v ./cmd/geth
18+
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
1919
@echo "Linux cross compilation done:"
2020
@ls -l $(GOBIN)/geth-linux-*
2121

2222
geth-darwin: xgo
23-
build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=darwin/* -v ./cmd/geth
23+
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
2424
@echo "Darwin cross compilation done:"
2525
@ls -l $(GOBIN)/geth-darwin-*
2626

2727
geth-windows: xgo
28-
build/env.sh $(GOBIN)/xgo --dest=$(GOBIN) --deps=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 --targets=windows/* -v ./cmd/geth
28+
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
2929
@echo "Windows cross compilation done:"
3030
@ls -l $(GOBIN)/geth-windows-*
3131

3232
geth-android: xgo
33-
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
33+
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
3434
@echo "Android cross compilation done:"
3535
@ls -l $(GOBIN)/geth-android-*
3636

3737
evm:
38-
build/env.sh $(GOROOT)/bin/go install -v $(shell build/ldflags.sh) ./cmd/evm
38+
build/env.sh $(GOROOT)/bin/go install -v $(shell build/flags.sh) ./cmd/evm
3939
@echo "Done building."
4040
@echo "Run \"$(GOBIN)/evm to start the evm."
41-
mist:
42-
build/env.sh go install -v $(shell build/flags.sh) ./cmd/mist
43-
@echo "Done building."
44-
@echo "Run \"$(GOBIN)/mist --asset_path=cmd/mist/assets\" to launch mist."
4541

4642
all:
4743
build/env.sh go install -v $(shell build/flags.sh) ./...

0 commit comments

Comments
 (0)