Update LLVM version
This commit is contained in:
+10
-10
@@ -13,9 +13,9 @@ COPY install-llvm.sh .
|
||||
RUN apt-get update && \
|
||||
./install-llvm.sh && \
|
||||
apt-get install -y bash bzip2 git make patch xz-utils && \
|
||||
ln -s $(which clang-21) /usr/bin/clang && \
|
||||
ln -s $(which clang++-21) /usr/bin/clang++ && \
|
||||
ln -s $(which ld64.lld-21) /usr/bin/ld64.lld && \
|
||||
ln -s $(which clang-22) /usr/bin/clang && \
|
||||
ln -s $(which clang++-22) /usr/bin/clang++ && \
|
||||
ln -s $(which ld64.lld-22) /usr/bin/ld64.lld && \
|
||||
SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
|
||||
|
||||
FROM rust:1.95-bookworm
|
||||
@@ -31,13 +31,13 @@ RUN rustup target add x86_64-pc-windows-msvc && \
|
||||
cargo install cargo-bundle xwin && \
|
||||
xwin --accept-license splat --output xwin && \
|
||||
rm -rf .xwin-cache && \
|
||||
ln -s $(which clang-21) /usr/bin/clang && \
|
||||
ln -s $(which clang++-21) /usr/bin/clang++
|
||||
ln -s $(which clang-22) /usr/bin/clang && \
|
||||
ln -s $(which clang++-22) /usr/bin/clang++
|
||||
COPY --from=osxcross /osxcross /osxcross
|
||||
|
||||
ENV PATH="/osxcross/bin:$PATH" \
|
||||
LD_LIBRARY_PATH="/osxcross/lib" \
|
||||
CC="clang-21" CXX="clang++-21" AR="llvm-ar-21" \
|
||||
CC="clang-22" CXX="clang++-22" AR="llvm-ar-22" \
|
||||
CC_x86_64-apple-darwin="o64-clang" \
|
||||
CXX_x86_64-apple-darwin="o64-clang++" \
|
||||
CC_aarch64-apple-darwin="oa64-clang" \
|
||||
@@ -47,11 +47,11 @@ ENV PATH="/osxcross/bin:$PATH" \
|
||||
SHROOMS_CFLAGS_x86_64-pc-windows-msvc="-flto" \
|
||||
CFLAGS_x86_64-pc-windows-msvc="-I/xwin/crt/include -I/xwin/sdk/include/ucrt -I/xwin/sdk/include/um -I/xwin/sdk/include/shared" \
|
||||
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUSTFLAGS="-Lnative=/xwin/crt/lib/x86_64 -Lnative=/xwin/sdk/lib/um/x86_64 -Lnative=/xwin/sdk/lib/ucrt/x86_64 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld" \
|
||||
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-21" \
|
||||
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-22" \
|
||||
CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
|
||||
CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-21" \
|
||||
CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-22" \
|
||||
CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="oa64-clang" \
|
||||
CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-21" \
|
||||
RC_PATH="llvm-rc-21" \
|
||||
CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-22" \
|
||||
RC_PATH="llvm-rc-22" \
|
||||
MACOSX_DEPLOYMENT_TARGET="14.5"
|
||||
ENTRYPOINT ["bash"]
|
||||
|
||||
Reference in New Issue
Block a user