Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-10 05:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #625 from bensuperpc/add_openmp

Browse Source 
Add OpenMP on linux-x64-clang and fix tests
This commit is contained in:
Bensuperpc 2021-10-17 19:29:03 +02:00 committed by GitHub
commit b922daff52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

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

20
linux-x64-clang/Dockerfile.in
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 \ && 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 - \ && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \ && 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} liblld-${CLANG_VERSION}-dev \
&& 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 \ && apt-get clean --yes \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \ && 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/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/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 \ && cc --version \
&& c++ --version \ && c++ --version \
&& cpp --version && cpp --version
ENV CROSS_TRIPLE x86_64-linux-gnu ENV CROSS_TRIPLE x86_64-linux-gnu
ENV CROSS_ROOT /usr/bin ENV CROSS_ROOT /usr/bin
ENV CC=/usr/bin/clang \ ENV CC=/usr/bin/clang-${CLANG_VERSION} \
CPP=/usr/bin/cpp \ CPP=/usr/bin/clang-cpp-${CLANG_VERSION} \
CXX=/usr/bin/clang++ \ CXX=/usr/bin/clang++-${CLANG_VERSION} \
LD=/usr/bin/lld \ LD=/usr/bin/lld-${CLANG_VERSION} \
FC=/usr/bin/flang AS=/usr/bin/llvm-as-${CLANG_VERSION} \
AR=/usr/bin/llvm-ar-${CLANG_VERSION}
# AS=/usr/bin/${CROSS_TRIPLE}-as # FC=/usr/bin/flang
# AR=/usr/bin/${CROSS_TRIPLE}-ar
COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop