Skip to content

Commit

Permalink
Build node with iterated pattern matching (#406)
Browse files Browse the repository at this point in the history
* deps/k: update submodule

* use iterated pattern matching for node build

* update to llvm 8
  • Loading branch information
dwightguth authored and ehildenb committed Jul 23, 2019
1 parent 1c4d9d8 commit ac18a27
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ RUN ln --symbolic --no-dereference --force /usr/share/zoneinfo/$TZ /etc/local
RUN apt update \
&& apt upgrade --yes \
&& apt install --yes \
autoconf bison clang-6.0 cmake curl flex gcc libboost-test-dev \
autoconf bison clang-8 cmake curl flex gcc libboost-test-dev \
libcrypto++-dev libffi-dev libjemalloc-dev libmpfr-dev libprocps-dev \
libsecp256k1-dev libssl-dev libtool libyaml-dev lld-6.0 llvm-6.0-tools \
libsecp256k1-dev libssl-dev libtool libyaml-dev lld-8 llvm-8-tools \
make maven opam openjdk-8-jdk pandoc pkg-config python3 python-pygments \
python-recommonmark python-sphinx time zlib1g-dev protobuf-compiler \
libprotobuf-dev
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ $(libsecp256k1_out):
&& make -s -j4 \
&& make install

LIBFF_CC ?=clang-6.0
LIBFF_CXX?=clang++-6.0
LIBFF_CC ?=clang-8
LIBFF_CXX?=clang++-8

$(libff_out):
@echo "== submodule: $(DEPS_DIR)/libff"
Expand Down Expand Up @@ -279,6 +279,7 @@ $(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/interpreter: $(node_files) $(DEFN_DI
--syntax-module $(SYNTAX_MODULE) $(DEFN_DIR)/node/$(MAIN_DEFN_FILE).k \
--directory $(DEFN_DIR)/node -I $(DEFN_DIR)/node -I $(DEFN_DIR)/node \
--hook-namespaces "KRYPTO BLOCKCHAIN" \
--iterated \
$(KOMPILE_OPTS) \
-ccopt $(PLUGIN_SUBMODULE)/plugin-c/crypto.cpp -ccopt $(PLUGIN_SUBMODULE)/plugin-c/blockchain.cpp -ccopt $(PLUGIN_SUBMODULE)/plugin-c/world.cpp -ccopt $(CURDIR)/$(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/plugin/proto/msg.pb.cc \
-ccopt -I$(CURDIR)/$(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/plugin \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export PATH=$HOME/.local/bin:$PATH
The LLVM backend has additional dependencies:

```k
sudo apt install cmake clang-6.0 clang++-6.0 llvm-6.0 lld-6.0 libboost-test-dev libgmp-dev libyaml-cpp-dev libjemalloc-dev curl protobuf-compiler libprotobuf-dev
sudo apt install cmake clang-8 clang++-8 llvm-8 lld-8 libboost-test-dev libgmp-dev libyaml-cpp-dev libjemalloc-dev curl protobuf-compiler libprotobuf-dev
```

On Arch, you'll also need `crypto++` package.
Expand Down
2 changes: 1 addition & 1 deletion deps/k
Submodule k updated from 89361d to 0fdaeb
2 changes: 1 addition & 1 deletion package/Dockerfile.ubuntu-bionic
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN ln --symbolic --no-dereference --force /usr/share/zoneinfo/$TZ /etc/local

RUN apt update \
&& apt upgrade --yes \
&& apt install --yes clang-6.0 cmake curl dh-make jq libcrypto++-dev libjemalloc-dev \
&& apt install --yes clang-8 cmake curl dh-make jq libcrypto++-dev libjemalloc-dev \
libprocps-dev libprotobuf-dev libsecp256k1-dev libssl-dev \
pandoc pkg-config protobuf-compiler

Expand Down
2 changes: 1 addition & 1 deletion package/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: kevm
Section: devel
Priority: optional
Maintainer: Everett Hildenbrandt <[email protected]>
Build-Depends: kframework, protobuf-compiler, pandoc, clang-6.0, cmake, pkg-config, libjemalloc-dev, libssl-dev, libprocps-dev, libprotobuf-dev, libcrypto++-dev, libsecp256k1-dev
Build-Depends: kframework, protobuf-compiler, pandoc, clang-8, cmake, pkg-config, libjemalloc-dev, libssl-dev, libprocps-dev, libprotobuf-dev, libcrypto++-dev, libsecp256k1-dev
Standards-Version: 3.9.6
Homepage: https://github.com/kframework/evm-semantics

Expand Down

0 comments on commit ac18a27

Please sign in to comment.