From 5d97dc31aa82deebe05ee62233f76291b983155d Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Sun, 17 Oct 2021 13:10:33 +0200 Subject: [PATCH 1/3] Add OpenMP on linux-x64-clang Signed-off-by: Bensuperpc --- linux-x64-clang/Dockerfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-x64-clang/Dockerfile.in b/linux-x64-clang/Dockerfile.in index f9de5d9..11bc6e5 100644 --- a/linux-x64-clang/Dockerfile.in +++ b/linux-x64-clang/Dockerfile.in @@ -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 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 \ From 47215f71ba02569bebda51b593429f71e1fd8686 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Sun, 17 Oct 2021 13:53:26 +0200 Subject: [PATCH 2/3] Fix llvm-ar and llvm-as Signed-off-by: Bensuperpc --- linux-x64-clang/Dockerfile.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/linux-x64-clang/Dockerfile.in b/linux-x64-clang/Dockerfile.in index 11bc6e5..f376755 100644 --- a/linux-x64-clang/Dockerfile.in +++ b/linux-x64-clang/Dockerfile.in @@ -11,7 +11,7 @@ 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 -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/* \ @@ -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 From 259afe733bb7f7510de878aecb7384f13f42a312 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Sun, 17 Oct 2021 14:01:04 +0200 Subject: [PATCH 3/3] Enable tests on linux-x64-clang image Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 756049f..05d1a7d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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: "", } - {