From dddce7bf93a775ef882b796fde653acb627c8fac Mon Sep 17 00:00:00 2001 From: vms Date: Wed, 14 Aug 2019 01:20:56 +0300 Subject: [PATCH] move to wasi 6 --- Dockerfile | 5 +++-- Makefile | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3b7d12..a5678d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,10 @@ RUN apt-get update \ && apt-get install -y ca-certificates \ curl \ git \ - make + make \ + libtinfo5 -RUN curl -L https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-5/wasi-sdk-5.0-linux.tar.gz | tar xz --strip-components=1 -C / +RUN curl -L https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-6/wasi-sdk-6.0-linux.tar.gz | tar xz --strip-components=1 -C / VOLUME /code WORKDIR /code diff --git a/Makefile b/Makefile index cae6c47..5c78835 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ TARGET = sqlite3 CC = /opt/wasi-sdk/bin/clang -SYSROOT = /opt/wasi-sdk/share/sysroot +SYSROOT = /opt/wasi-sdk/share/wasi-sysroot TARGET_TRIPLE = wasm32-unknown-wasi CFLAGS = -nostartfiles -fvisibility=hidden LDFLAGS = -Wl,--no-entry,--demangle,--allow-undefined @@ -16,7 +16,7 @@ default: $(TARGET) all: default $(TARGET): $(SDK) $(SQLITE_SRC) $(WRAPPER_SRC) - $(CC) --sysroot=$(SYSROOT) --target=$(TARGET_TRIPLE) -O2 $(SQLITE_FLAGS) $(CFLAGS) $(LDFLAGS) -Wl,$(EXPORT_FUNCS) $^ -o $@.wasm + $(CC) -O3 --sysroot=$(SYSROOT) --target=$(TARGET_TRIPLE) $(SQLITE_FLAGS) $(CFLAGS) $(LDFLAGS) -Wl,$(EXPORT_FUNCS) $^ -o $@.wasm .PRECIOUS: $(TARGET)