Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-02-10 11:35:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #862 from thewtex/master

Browse Source 
web-wasi-threads: use target wasm32-wasi-threads in sysroot wrapper
This commit is contained in:
Matt McCormick 2025-01-08 13:02:22 -05:00 committed by GitHub
commit 7bf589c088
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web-wasi-threads/Dockerfile.in
View File

@ -3,7 +3,11 @@ FROM ${ORG}/web-wasi:latest
LABEL maintainer="Matt McCormick matt@mmmccormick.com"
COPY clang-wasi-threads-sysroot.sh clang++-wasi-threads-sysroot.sh /usr/local/bin/
ENV CROSS_TRIPLE=wasm32-wasi-threads
ENV CC=clang-wasi-threads-sysroot.sh \
CXX=clang++-wasi-threads-sysroot.sh
COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

4
web-wasi-threads/Toolchain.cmake
View File

@ -4,7 +4,7 @@ include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk-pthread.cmake)
set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
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_C_COMPILER /usr/local/bin/clang-wasi-threads-sysroot.sh)
set(CMAKE_CXX_COMPILER /usr/local/bin/clang++-wasi-threads-sysroot.sh)
set(CMAKE_CROSSCOMPILING_EMULATOR /wasi-runtimes/wasmtime/bin/wasmtime-pwd-threads.sh)

3
web-wasi-threads/clang++-wasi-threads-sysroot.sh Executable file
View File

@ -0,0 +1,3 @@
#!/usr/bin/env sh
exec ${WASI_SDK_PATH}/bin/clang++ -pthread --target=wasm32-wasi-threads --sysroot=${WASI_SYSROOT} "$@"

3
web-wasi-threads/clang-wasi-threads-sysroot.sh Executable file
View File

@ -0,0 +1,3 @@
#!/usr/bin/env sh
exec ${WASI_SDK_PATH}/bin/clang -pthread --target=wasm32-wasi-threads --sysroot=${WASI_SYSROOT} "$@"