mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-06-19 09:29:25 +02:00
Compare commits
7 Commits
update_scr
...
add_openmp
Author | SHA1 | Date | |
---|---|---|---|
259afe733b | |||
47215f71ba | |||
5d97dc31aa | |||
2b6cd4ae1d | |||
1ec42ecb43 | |||
ef0ff63ed9 | |||
93b23ec997 |
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@ -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: "",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -26,6 +26,8 @@ ENV AR=${CROSS_ROOT}/bin/llvm-ar \
|
|||||||
CXX=clang++-wasi-sysroot.sh \
|
CXX=clang++-wasi-sysroot.sh \
|
||||||
LD=${CROSS_ROOT}/bin/wasm-ld
|
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}/
|
COPY Toolchain.cmake ${CROSS_ROOT}/
|
||||||
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
|
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/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)
|
include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake)
|
||||||
|
|
||||||
set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
|
set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
|
||||||
|
2
web-wasi/WASI.cmake
Normal file
2
web-wasi/WASI.cmake
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
set(WASI 1)
|
||||||
|
set(UNIX 1)
|
Reference in New Issue
Block a user