Compare commits

...

7 Commits

Author SHA1 Message Date
259afe733b Enable tests on linux-x64-clang image
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-17 14:01:04 +02:00
47215f71ba Fix llvm-ar and llvm-as
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-17 13:53:26 +02:00
5d97dc31aa Add OpenMP on linux-x64-clang
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-17 13:10:33 +02:00
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
1ec42ecb43 Merge pull request #619 from bensuperpc/update_scripts 2021-10-14 13:54:55 -04:00
ef0ff63ed9 web-wasi: Initialize WASI_SDK_PATH for wasi-sdk.cmake, set UNIX 2021-10-13 23:47:29 -04:00
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
5 changed files with 17 additions and 14 deletions

View File

@ -383,7 +383,7 @@ jobs:
stockfish_arg: "ARCH=x86-64-modern COMP=clang",
ninja: "yes",
ninja_arg: "",
openssl: "no",
openssl: "yes",
openssl_arg: "linux-x86_64-clang",
C: "yes",
C_arg: "",
@ -391,7 +391,7 @@ jobs:
C-Plus-Plus_arg: "",
fmt: "yes",
fmt_arg: "",
cpython: "no",
cpython: "yes",
cpython_arg: "",
}
- {

View File

@ -11,8 +11,8 @@ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /et
&& echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \
&& apt-get purge --autoremove -y gcc g++ software-properties-common \
&& apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} \
&& apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} liblld-${CLANG_VERSION}-dev \
&& apt-get -y install libomp-${CLANG_VERSION}-dev clang-tools-${CLANG_VERSION} clangd-${CLANG_VERSION} libclang-${CLANG_VERSION}-dev libclang-common-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev \
&& apt-get clean --yes \
&& rm -rf /var/lib/apt/lists/* \
&& update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \
@ -20,20 +20,20 @@ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /et
&& update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/lld lld /usr/bin/lld-${CLANG_VERSION} 90 \
&& cc --version \
&& c++ --version \
&& cpp --version
ENV CROSS_TRIPLE x86_64-linux-gnu
ENV CROSS_ROOT /usr/bin
ENV CC=/usr/bin/clang \
CPP=/usr/bin/cpp \
CXX=/usr/bin/clang++ \
LD=/usr/bin/lld \
FC=/usr/bin/flang
# AS=/usr/bin/${CROSS_TRIPLE}-as
# AR=/usr/bin/${CROSS_TRIPLE}-ar
ENV CC=/usr/bin/clang-${CLANG_VERSION} \
CPP=/usr/bin/clang-cpp-${CLANG_VERSION} \
CXX=/usr/bin/clang++-${CLANG_VERSION} \
LD=/usr/bin/lld-${CLANG_VERSION} \
AS=/usr/bin/llvm-as-${CLANG_VERSION} \
AR=/usr/bin/llvm-ar-${CLANG_VERSION}
# FC=/usr/bin/flang
COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop

View File

@ -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

View File

@ -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})

2
web-wasi/WASI.cmake Normal file
View File

@ -0,0 +1,2 @@
set(WASI 1)
set(UNIX 1)