Skip to content

Commit ac18a27

Browse files
dwightguthehildenb
authored andcommitted
Build node with iterated pattern matching (#406)
* deps/k: update submodule * use iterated pattern matching for node build * update to llvm 8
1 parent 1c4d9d8 commit ac18a27

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ RUN ln --symbolic --no-dereference --force /usr/share/zoneinfo/$TZ /etc/local
77
RUN apt update \
88
&& apt upgrade --yes \
99
&& apt install --yes \
10-
autoconf bison clang-6.0 cmake curl flex gcc libboost-test-dev \
10+
autoconf bison clang-8 cmake curl flex gcc libboost-test-dev \
1111
libcrypto++-dev libffi-dev libjemalloc-dev libmpfr-dev libprocps-dev \
12-
libsecp256k1-dev libssl-dev libtool libyaml-dev lld-6.0 llvm-6.0-tools \
12+
libsecp256k1-dev libssl-dev libtool libyaml-dev lld-8 llvm-8-tools \
1313
make maven opam openjdk-8-jdk pandoc pkg-config python3 python-pygments \
1414
python-recommonmark python-sphinx time zlib1g-dev protobuf-compiler \
1515
libprotobuf-dev

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ $(libsecp256k1_out):
7979
&& make -s -j4 \
8080
&& make install
8181

82-
LIBFF_CC ?=clang-6.0
83-
LIBFF_CXX?=clang++-6.0
82+
LIBFF_CC ?=clang-8
83+
LIBFF_CXX?=clang++-8
8484

8585
$(libff_out):
8686
@echo "== submodule: $(DEPS_DIR)/libff"
@@ -279,6 +279,7 @@ $(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/interpreter: $(node_files) $(DEFN_DI
279279
--syntax-module $(SYNTAX_MODULE) $(DEFN_DIR)/node/$(MAIN_DEFN_FILE).k \
280280
--directory $(DEFN_DIR)/node -I $(DEFN_DIR)/node -I $(DEFN_DIR)/node \
281281
--hook-namespaces "KRYPTO BLOCKCHAIN" \
282+
--iterated \
282283
$(KOMPILE_OPTS) \
283284
-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 \
284285
-ccopt -I$(CURDIR)/$(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/plugin \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export PATH=$HOME/.local/bin:$PATH
138138
The LLVM backend has additional dependencies:
139139

140140
```k
141-
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
141+
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
142142
```
143143

144144
On Arch, you'll also need `crypto++` package.

deps/k

Submodule k updated from 89361d7 to 0fdaeb2

package/Dockerfile.ubuntu-bionic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN ln --symbolic --no-dereference --force /usr/share/zoneinfo/$TZ /etc/local
66

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

package/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: kevm
22
Section: devel
33
Priority: optional
44
Maintainer: Everett Hildenbrandt <[email protected]>
5-
Build-Depends: kframework, protobuf-compiler, pandoc, clang-6.0, cmake, pkg-config, libjemalloc-dev, libssl-dev, libprocps-dev, libprotobuf-dev, libcrypto++-dev, libsecp256k1-dev
5+
Build-Depends: kframework, protobuf-compiler, pandoc, clang-8, cmake, pkg-config, libjemalloc-dev, libssl-dev, libprocps-dev, libprotobuf-dev, libcrypto++-dev, libsecp256k1-dev
66
Standards-Version: 3.9.6
77
Homepage: https://github.com/kframework/evm-semantics
88

0 commit comments

Comments
 (0)