From ed2c1eb321b5232273c90a5718efc13cfe2184c3 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Wed, 3 Nov 2021 19:28:11 -0400
Subject: [PATCH] web-wasi: Use wasmtime instead of wasmer for the
 cross-compiling emulator

wasmtime is the official reference implementation and wasmer has
permission issues without sudo.
---
 web-wasi/Dockerfile.in                      | 9 +++++----
 web-wasi/Toolchain.cmake                    | 2 +-
 web-wasi/{wasmer-pwd.sh => wasmtime-pwd.sh} | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename web-wasi/{wasmer-pwd.sh => wasmtime-pwd.sh} (54%)

diff --git a/web-wasi/Dockerfile.in b/web-wasi/Dockerfile.in
index fa80be8..2a92daa 100644
--- a/web-wasi/Dockerfile.in
+++ b/web-wasi/Dockerfile.in
@@ -3,9 +3,10 @@ FROM dockcross/base:latest
 LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # The cross-compiling emulator
-ENV WASMER_DIR /usr/local/wasmer
-RUN curl https://get.wasmer.io -sSfL | sh
-ENV PATH /usr/local/wasmer/bin:${PATH}
+ENV WASMTIME_HOME /usr/local/wasmtime
+RUN mkdir ${WASMTIME_HOME} && curl https://wasmtime.dev/install.sh -sSf | bash
+COPY wasmtime-pwd.sh ${WASMTIME_HOME}/bin/
+ENV PATH "$WASMTIME_HOME/bin:$PATH"
 
 ENV WASI_VERSION 12
 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_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_ROOT=${WASI_SDK_PATH}
diff --git a/web-wasi/Toolchain.cmake b/web-wasi/Toolchain.cmake
index 1e747bb..e2efc8b 100644
--- a/web-wasi/Toolchain.cmake
+++ b/web-wasi/Toolchain.cmake
@@ -7,4 +7,4 @@ set(CMAKE_SYSROOT $ENV{WASI_SYSROOT})
 set(CMAKE_C_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)
diff --git a/web-wasi/wasmer-pwd.sh b/web-wasi/wasmtime-pwd.sh
similarity index 54%
rename from web-wasi/wasmer-pwd.sh
rename to web-wasi/wasmtime-pwd.sh
index 4677ae8..919a506 100755
--- a/web-wasi/wasmer-pwd.sh
+++ b/web-wasi/wasmtime-pwd.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 # 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 "$@"