Tools build with nlvm docker completely now.

This commit is contained in:
Jacques Wagener 2019-08-20 15:37:44 +02:00
parent 74cf8c2554
commit 61ce33054c
No known key found for this signature in database
GPG Key ID: C294D1025DA0E923
6 changed files with 28 additions and 12 deletions

9
.gitmodules vendored Normal file
View File

@ -0,0 +1,9 @@
[submodule "vendors/stint"]
path = vendors/stint
url = https://github.com/status-im/nim-stint.git
[submodule "vendors/nimcrypto"]
path = vendors/nimcrypto
url = https://github.com/cheatfate/nimcrypto.git
[submodule "vendors/nim-stew"]
path = vendors/nim-stew
url = https://github.com/status-im/nim-stew.git

View File

@ -1,12 +1,7 @@
NLVM=./tools/nlvm
# NLVM=nim
.PHONY: get-nlvm examples
get-nlvm-appimage:
curl -L https://github.com/arnetheduck/nlvm/releases/download/continuous/nlvm-x86_64.AppImage -o tools/nlvm
chmod +x tools/nlvm
pwd=$(shell pwd)
NLVM_PATH_PARAMS=-p:/code/vendors/nimcrypto -p:/code/vendors/stint -p:/code/vendors/nim-stew/
DOCKER_NLVM=docker run -w /code/ -v $(pwd):/code/ jacqueswww/nlvm
DOCKER_NLVM_C=$(DOCKER_NLVM) $(NLVM_PATH_PARAMS) c
.PHONY: get-nlvm-docker
get-nlvm-docker:
@ -19,13 +14,22 @@ get-wabt:
.PHONY: tools
tools:
nim c -d:release --out:tools/abi_gen tools/abi_gen.nim
nim c -d:release --out:tools/k256_sig tools/k256_sig.nim
$(DOCKER_NLVM_C) -d:release --out:tools/k256_sig tools/k256_sig.nim
$(DOCKER_NLVM_C) -d:release --out:tools/abi_gen tools/abi_gen.nim
.PHONY: clean
clean:
rm -f *.wasm *.ll *.wat
.PHONY: get-nlvm examples
get-nlvm-appimage:
curl -L https://github.com/arnetheduck/nlvm/releases/download/continuous/nlvm-x86_64.AppImage -o tools/nlvm
chmod +x tools/nlvm
.PHONY: vendors
vendors:
cd vendors
git submodule update
examples:
@$(MAKE) -C examples

Binary file not shown.

1
vendors/nim-stew vendored Submodule

@ -0,0 +1 @@
Subproject commit 43bbe48e5f8181b7ca8923e6edf78dec635e8aea

1
vendors/nimcrypto vendored Submodule

@ -0,0 +1 @@
Subproject commit e41d686539e2f17fa167ca6a963fb4ded704fd05

1
vendors/stint vendored Submodule

@ -0,0 +1 @@
Subproject commit d0162902b7f5ef2e18ff516e96014196d527cedc