Merge pull request #47 from gofractally/wasi-p1-p2

Add libclang_rt.builtins for wasip2 and wasip2

Author: swatanabe

docker/ubuntu-2204-builder.Dockerfile

@@ -48,9 +48,11 @@ ENV WASI_SDK_PREFIX=/usr/lib/llvm-18
 ENV PATH=${WASI_SDK_PREFIX}/bin:$PATH
 RUN cd ${WASI_SDK_PREFIX}/lib/clang/18/                         \
     && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
-    && mkdir -p lib/wasi                                        \
+    && mkdir -p lib/wasi lib/wasip1 lib/wasip2                  \
     && tar xf libclang_rt.builtins-wasm32-wasi-24.0.tar.gz -C lib/wasi --strip-components=1 \
     && rm libclang_rt.builtins-wasm32-wasi-24.0.tar.gz          \
+    && ln lib/wasi/libclang_rt.builtins-wasm32.a lib/wasip1     \
+    && ln lib/wasi/libclang_rt.builtins-wasm32.a lib/wasip2     \
     && cd ${WASI_SDK_PREFIX}/share                              \
     && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sysroot-24.0.tar.gz \
     && tar xf wasi-sysroot-24.0.tar.gz --transform 's/^[^\/]*/wasi-sysroot/' \

docker/ubuntu-2404-builder.Dockerfile

@@ -42,9 +42,11 @@ ENV WASI_SDK_PREFIX=/usr/lib/llvm-18
 ENV PATH=${WASI_SDK_PREFIX}/bin:$PATH
 RUN cd ${WASI_SDK_PREFIX}/lib/clang/18/                         \
     && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
-    && mkdir -p lib/wasi                                        \
+    && mkdir -p lib/wasi lib/wasip1 lib/wasip2                  \
     && tar xf libclang_rt.builtins-wasm32-wasi-24.0.tar.gz -C lib/wasi --strip-components=1 \
     && rm libclang_rt.builtins-wasm32-wasi-24.0.tar.gz          \
+    && ln lib/wasi/libclang_rt.builtins-wasm32.a lib/wasip1     \
+    && ln lib/wasi/libclang_rt.builtins-wasm32.a lib/wasip2     \
     && cd ${WASI_SDK_PREFIX}/share                              \
     && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sysroot-24.0.tar.gz \
     && tar xf wasi-sysroot-24.0.tar.gz --transform 's/^[^\/]*/wasi-sysroot/' \