Update linux-x64-tinycc and enable openSSL test

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Merge pull request #620 from thewtex/wasi-cmake-platform
2025-06-17 16:39:25 +02:00 · 2021-10-17 14:31:34 +02:00 · 2021-10-14 20:52:56 -04:00 · 2021-10-14 13:54:55 -04:00 · 2021-10-13 23:47:29 -04:00 · 2021-10-13 15:41:28 -04:00
4 changed files with 7 additions and 4 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -366,8 +366,8 @@ jobs:
              stockfish_arg: "ARCH=x86-64-modern",
              ninja: "yes",
              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
+              openssl: "yes",
+              openssl_arg: "linux-generic64 no-tests no-asm no-hw no-dtls no-shared no-dso",
              C: "no",
              C_arg: "",
              C-Plus-Plus: "yes",
--- a/web-wasi/Dockerfile.in
+++ b/web-wasi/Dockerfile.in
@ -26,6 +26,8 @@ ENV AR=${CROSS_ROOT}/bin/llvm-ar \
    CXX=clang++-wasi-sysroot.sh \
    LD=${CROSS_ROOT}/bin/wasm-ld

+COPY WASI.cmake /usr/src/
+RUN mv /usr/src/WASI.cmake /usr/share/cmake-*/Modules/Platform/
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

--- a/web-wasi/Toolchain.cmake
+++ b/web-wasi/Toolchain.cmake
@ -1,5 +1,4 @@
-set(WASI 1)
-
+set(WASI_SDK_PREFIX $ENV{WASI_SDK_PATH})
 include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake)

 set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
--- a/web-wasi/WASI.cmake
+++ b/web-wasi/WASI.cmake
@ -0,0 +1,2 @@
+set(WASI 1)
+set(UNIX 1)
Author	SHA1	Message	Date
Bensuperpc	5322eac0bf	Update linux-x64-tinycc and enable openSSL test Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-17 14:31:34 +02:00
Matt McCormick	2b6cd4ae1d	Merge pull request #620 from thewtex/wasi-cmake-platform web-wasi: Patch CMake with WASI platform	2021-10-14 20:52:56 -04:00
Matt McCormick	1ec42ecb43	Merge pull request #619 from bensuperpc/update_scripts	2021-10-14 13:54:55 -04:00
Matt McCormick	ef0ff63ed9	web-wasi: Initialize WASI_SDK_PATH for wasi-sdk.cmake, set UNIX	2021-10-13 23:47:29 -04:00
Matt McCormick	93b23ec997	web-wasi: Patch CMake with WASI platform WASI.cmake taken from the wasi-sdk repository. To address the build time warning: System is unknown to cmake, create: Platform/WASI to use this system, please post your config file on discourse.cmake.org so it can be added to cmake	2021-10-13 15:41:28 -04:00