PVB/lemur
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 51 Wiki Activity

Update rust

Browse Source
This commit is contained in:
SonicSwordcane
2026-10-19 21:21:26 -04:00
parent 53cda2e515
commit e8fb942896
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.Dockerfile
+12 -12
View File
@@ -10,10 +10,10 @@ RUN apt-get update && \
apt-get install -y ca-certificates
COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
RUN apt-get update && \
apt-get install -y bash bzip2 clang-22 git lld-22 llvm-22 make patch xz-utils && \
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 && \
apt-get install -y bash bzip2 clang-23 git lld-23 llvm-23 make patch xz-utils && \
ln -s $(which clang-23) /usr/bin/clang && \
ln -s $(which clang++-23) /usr/bin/clang++ && \
ln -s $(which ld64.lld-23) /usr/bin/ld64.lld && \
SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
FROM rust:1.99-trixie
@@ -23,17 +23,17 @@ RUN rustup target add x86_64-pc-windows-msvc && \
rustup target add x86_64-apple-darwin && \
rustup target add aarch64-apple-darwin && \
apt-get update && \
apt-get install -y clang-22 lld-22 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
apt-get install -y clang-23 lld-23 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
cargo install cargo-bundle xwin && \
xwin --accept-license splat --output xwin && \
rm -rf .xwin-cache && \
ln -s $(which clang-22) /usr/bin/clang && \
ln -s $(which clang++-22) /usr/bin/clang++
ln -s $(which clang-23) /usr/bin/clang && \
ln -s $(which clang++-23) /usr/bin/clang++
COPY --from=osxcross /osxcross /osxcross
ENV PATH="/osxcross/bin:$PATH" \
LD_LIBRARY_PATH="/osxcross/lib" \
CC="clang-22" CXX="clang++-22" AR="llvm-ar-22" \
CC="clang-23" CXX="clang++-23" AR="llvm-ar-23" \
CC_x86_64-apple-darwin="o64-clang" \
CXX_x86_64-apple-darwin="o64-clang++" \
CC_aarch64-apple-darwin="oa64-clang" \
@@ -43,11 +43,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-22" \
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-23" \
CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-22" \
CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-23" \
CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="oa64-clang" \
CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-22" \
RC_PATH="llvm-rc-22" \
CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-23" \
RC_PATH="llvm-rc-23" \
MACOSX_DEPLOYMENT_TARGET="14.5"
ENTRYPOINT ["bash"]