diff --git a/Dockerfile b/Dockerfile index c8815e117f..58b54ab598 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Makefile b/Makefile index dfe79d23ed..fbc6deba5b 100644 --- a/Makefile +++ b/Makefile @@ -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" @@ -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 \ diff --git a/README.md b/README.md index fe0a50d33e..a6d2f28f0a 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/deps/k b/deps/k index 89361d7c8f..0fdaeb2c84 160000 --- a/deps/k +++ b/deps/k @@ -1 +1 @@ -Subproject commit 89361d7c8fcbac2311201e53a7eaa31637c875b1 +Subproject commit 0fdaeb2c846a6c4662ee646a707e9bf61e08218c diff --git a/package/Dockerfile.ubuntu-bionic b/package/Dockerfile.ubuntu-bionic index c38b0c6e66..39c3d216b8 100644 --- a/package/Dockerfile.ubuntu-bionic +++ b/package/Dockerfile.ubuntu-bionic @@ -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 diff --git a/package/debian/control b/package/debian/control index cc5223e5a5..be460784ee 100644 --- a/package/debian/control +++ b/package/debian/control @@ -2,7 +2,7 @@ Source: kevm Section: devel Priority: optional Maintainer: Everett Hildenbrandt -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