Skip to content

Commit 8aa4597

Browse files
committed
Merge pull request #2520 from karalabe/makefile-cross-update
Makefile: go build instead of install (solves cross compile issues)
2 parents 57ba182 + 6a00a3a commit 8aa4597

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GOBIN = build/bin
1313
GO ?= latest
1414

1515
geth:
16-
build/env.sh go install -v $(shell build/flags.sh) ./cmd/geth
16+
build/env.sh go build -i -v $(shell build/flags.sh) -o $(GOBIN)/geth ./cmd/geth
1717
@echo "Done building."
1818
@echo "Run \"$(GOBIN)/geth\" to launch geth."
1919

@@ -103,7 +103,9 @@ evm:
103103
@echo "Run \"$(GOBIN)/evm to start the evm."
104104

105105
all:
106-
build/env.sh go install -v $(shell build/flags.sh) ./...
106+
for cmd in `ls ./cmd/`; do \
107+
build/env.sh go build -i -v $(shell build/flags.sh) -o $(GOBIN)/$$cmd ./cmd/$$cmd; \
108+
done
107109

108110
test: all
109111
build/env.sh go test ./...

0 commit comments

Comments
 (0)