diff --git a/runtime/Makefile b/runtime/Makefile index 9561c5c..aa70c14 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -79,8 +79,6 @@ BINARY_NAME=sledgert # Sets a flag equal to the processor architecture CFLAGS += -D${ARCH} -# Sandboxes running on Sledge always use WebAssembly linear memory -CFLAGS += -DUSE_MEM_VM # Preprocessor @@ -113,10 +111,10 @@ all: runtime bin/sledgert: ${CFILES} @echo "Compiling runtime" @mkdir -p bin/ - @${CC} ${CC_OPTIONS} ${INCLUDES} ${CFLAGS} ${LDFLAGS} ${CFILES} ${JSMNCFLAGS} -L/usr/lib/ $^ -o bin/sledgert + ${CC} ${CC_OPTIONS} ${INCLUDES} ${CFLAGS} ${LDFLAGS} ${JSMNCFLAGS} -L/usr/lib/ $^ -o bin/sledgert .PHONY: runtime -runtime: bin/sledgert +runtime: thirdparty bin/sledgert .PHONY: thirdparty thirdparty: @@ -134,8 +132,8 @@ distclean: clean @make --no-print-directory -C thirdparty clean .PHONY: submodules -fetch: +submodules: @git submodule update --init --recursive .PHONY: init -init: fetch clean thirdparty runtime +init: submodules clean thirdparty runtime diff --git a/runtime/thirdparty/Makefile b/runtime/thirdparty/Makefile index e798116..7ec4078 100644 --- a/runtime/thirdparty/Makefile +++ b/runtime/thirdparty/Makefile @@ -43,5 +43,3 @@ jsmn: ${DIST_PREFIX}/include/jsmn.h clean: make -C ck uninstall rm -rf ${DIST_PREFIX} - -.PHONY: clean all build ck jsmn http-parser