Merge branch 'master' into java-bindings

Author: jrhea

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 7.0.0
+current_version = 7.1.0-alpha.0
 tag = True
 sign_tags = True
 tag_message = EVMC {new_version}

CMakeLists.txt

@@ -37,7 +37,7 @@ cable_configure_toolchain(DEFAULT cxx11-pic)
 cable_set_build_type(DEFAULT Release CONFIGURATION_TYPES Debug Release)
 
 project(evmc)
-set(PROJECT_VERSION 7.0.0)
+set(PROJECT_VERSION 7.1.0-alpha.0)
 
 cable_configure_compiler(NO_STACK_PROTECTION)
 

bindings/java/Makefile

@@ -19,8 +19,8 @@ OUT_DIR = ./c/build
 
 build:
 	mkdir -p $(OUT_DIR)
-	gcc $(DEBUG_FLAG) -c $(INCLUDES) -o $(OUT_DIR)/loader.o ../../lib/loader/loader.c
-	gcc $(DEBUG_FLAG) -c $(INCLUDES) $(JAVA_INCLUDES) -o $(OUT_DIR)/host.o ./c/host.c
+	gcc $(DEBUG_FLAG) $(CFLAGS) -c $(INCLUDES) -o $(OUT_DIR)/loader.o ../../lib/loader/loader.c
+	gcc $(DEBUG_FLAG) $(CFLAGS) -c $(INCLUDES) $(JAVA_INCLUDES) -o $(OUT_DIR)/host.o ./c/host.c
 	gcc $(DEBUG_FLAG) ./c/evmc-vm.c $(INCLUDES) $(JAVA_INCLUDES) $(JAVA_LIBS) $(CFLAGS) $(LFLAGS) -o $(OUT_DIR)/evmc.$(EXT) $(OUT_DIR)/host.o $(OUT_DIR)/loader.o
 	gcc $(DEBUG_FLAG) -shared ../../examples/example_vm/example_vm.c $(INCLUDES) -o $(OUT_DIR)/example_vm.$(EXT)
 	mkdir -p ./java/build

bindings/rust/evmc-declare-tests/Cargo.toml

@@ -4,7 +4,7 @@
 
 [package]
 name = "evmc-declare-tests"
-version = "7.0.0"
+version = "7.1.0-alpha.0"
 authors = ["Jake Lang <jak3lang@gmail.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/ethereum/evmc"

bindings/rust/evmc-declare/Cargo.toml

@@ -4,7 +4,7 @@
 
 [package]
 name = "evmc-declare"
-version = "7.0.0"
+version = "7.1.0-alpha.0"
 authors = ["Jake Lang <jak3lang@gmail.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/ethereum/evmc"

bindings/rust/evmc-sys/Cargo.toml

@@ -4,7 +4,7 @@
 
 [package]
 name = "evmc-sys"
-version = "7.0.0"
+version = "7.1.0-alpha.0"
 authors = ["Alex Beregszaszi <alex@rtfs.hu>"]
 license = "Apache-2.0"
 repository = "https://github.com/ethereum/evmc"

bindings/rust/evmc-vm/Cargo.toml

@@ -4,7 +4,7 @@
 
 [package]
 name = "evmc-vm"
-version = "7.0.0"
+version = "7.1.0-alpha.0"
 authors = ["Alex Beregszaszi <alex@rtfs.hu>", "Jake Lang <jak3lang@gmail.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/ethereum/evmc"