From 001a9024079f8fb8a90d11700b651d3a353dabb5 Mon Sep 17 00:00:00 2001 From: Ivan Daniluk Date: Tue, 21 Nov 2017 16:40:52 +0200 Subject: [PATCH] Fix xgo invocation path after removal of env.sh (#466) --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f7fceb554..b68787660 100644 --- a/Makefile +++ b/Makefile @@ -51,16 +51,16 @@ statusgo-cross: statusgo-android statusgo-ios @ls -ld $(GOBIN)/statusgo-* statusgo-android: xgo ##@cross-compile Build status-go for Android - $(GOBIN)/xgo --image farazdagi/xgo --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v $(shell build/testnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image farazdagi/xgo --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v $(shell build/testnet-flags.sh) ./lib @echo "Android cross compilation done." statusgo-ios: xgo ##@cross-compile Build status-go for iOS - $(GOBIN)/xgo --image farazdagi/xgo --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/testnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image farazdagi/xgo --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/testnet-flags.sh) ./lib @echo "iOS framework cross compilation done." statusgo-ios-simulator: xgo ##@cross-compile Build status-go for iOS Simulator @docker pull farazdagi/xgo-ios-simulator - $(GOBIN)/xgo --image farazdagi/xgo-ios-simulator --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/testnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image farazdagi/xgo-ios-simulator --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/testnet-flags.sh) ./lib @echo "iOS framework cross compilation done." xgo: @@ -73,15 +73,15 @@ statusgo-mainnet: @echo "Run \"build/bin/statusgo\" to view available commands" statusgo-android-mainnet: xgo - $(GOBIN)/xgo --image farazdagi/xgo --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v $(shell build/mainnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image farazdagi/xgo --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v $(shell build/mainnet-flags.sh) ./lib @echo "Android cross compilation done (mainnet)." statusgo-ios-mainnet: xgo - $(GOBIN)/xgo --image farazdagi/xgo --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/mainnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image farazdagi/xgo --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/mainnet-flags.sh) ./lib @echo "iOS framework cross compilation done (mainnet)." statusgo-ios-simulator-mainnet: xgo - $(GOBIN)/xgo --image farazdagi/xgo-ios-simulator --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/mainnet-flags.sh) ./lib + $(GOPATH)/bin/xgo --image farazdagi/xgo-ios-simulator --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v $(shell build/mainnet-flags.sh) ./lib @echo "iOS framework cross compilation done (mainnet)." generate: ##@other Regenerate assets and other auto-generated stuff @@ -124,4 +124,4 @@ clean: ##@other Cleanup rm -f coverage.out coverage-all.out coverage.html deep-clean: clean - rm -Rdf .ethereumtest/StatusChain \ No newline at end of file + rm -Rdf .ethereumtest/StatusChain