Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

web-wasi: Use wasmtime instead of wasmer for the cross-compiling emulator

Browse Source 
wasmtime is the official reference implementation and wasmer has
permission issues without sudo.
This commit is contained in:
Matt McCormick 2021-11-03 19:28:11 -04:00
parent ea4d106ed8
commit ed2c1eb321
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web-wasi/Dockerfile.in
View File

@ -3,9 +3,10 @@ FROM dockcross/base:latest
LABEL maintainer="Matt McCormick matt.mccormick@kitware.com" LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
# The cross-compiling emulator # The cross-compiling emulator
ENV WASMER_DIR /usr/local/wasmer ENV WASMTIME_HOME /usr/local/wasmtime
RUN curl https://get.wasmer.io -sSfL | sh RUN mkdir ${WASMTIME_HOME} && curl https://wasmtime.dev/install.sh -sSf | bash
ENV PATH /usr/local/wasmer/bin:${PATH} COPY wasmtime-pwd.sh ${WASMTIME_HOME}/bin/
ENV PATH "$WASMTIME_HOME/bin:$PATH"
ENV WASI_VERSION 12 ENV WASI_VERSION 12
ENV WASI_VERSION_FULL ${WASI_VERSION}.0 ENV WASI_VERSION_FULL ${WASI_VERSION}.0
@ -16,7 +17,7 @@ RUN cd /usr/ && \
ENV WASI_SDK_PATH /usr/wasi-sdk-${WASI_VERSION_FULL} ENV WASI_SDK_PATH /usr/wasi-sdk-${WASI_VERSION_FULL}
ENV WASI_SYSROOT ${WASI_SDK_PATH}/share/wasi-sysroot ENV WASI_SYSROOT ${WASI_SDK_PATH}/share/wasi-sysroot
COPY clang-wasi-sysroot.sh clang++-wasi-sysroot.sh wasmer-pwd.sh /usr/local/bin/ COPY clang-wasi-sysroot.sh clang++-wasi-sysroot.sh wasmtime-pwd.sh /usr/local/bin/
ENV CROSS_TRIPLE=wasm32-wasi ENV CROSS_TRIPLE=wasm32-wasi
ENV CROSS_ROOT=${WASI_SDK_PATH} ENV CROSS_ROOT=${WASI_SDK_PATH}

2
web-wasi/Toolchain.cmake
View File

@ -7,4 +7,4 @@ set(CMAKE_SYSROOT $ENV{WASI_SYSROOT})
set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-sysroot.sh) set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-sysroot.sh)
set(CMAKE_CXX_COMPILER /usr/local/bin/clang++-wasi-sysroot.sh) set(CMAKE_CXX_COMPILER /usr/local/bin/clang++-wasi-sysroot.sh)
set(CMAKE_CROSSCOMPILING_EMULATOR /usr/local/bin/wasmer-pwd.sh) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/local/bin/wasmtime-pwd.sh)

2
web-wasi/wasmer-pwd.sh → web-wasi/wasmtime-pwd.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Mount the PWD to enable access in try_run commands # Mount the PWD to enable access in try_run commands
exec /usr/local/wasmer/bin/wasmer run --dir=. --dir=$PWD "$@" exec ${WASMTIME_HOME}/bin/wasmtime run --dir=. --dir=$PWD "$@"