diff --git a/build.Dockerfile b/build.Dockerfile index 6b5ded5..ceb2c36 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -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"] diff --git a/install-llvm.sh b/install-llvm.sh index e96effb..2812464 100755 --- a/install-llvm.sh +++ b/install-llvm.sh @@ -4,11 +4,11 @@ # The apt index for these is broken in bookworm, and upgrading to trixie # would make them depend on too new of a libc version. -# https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-21/clang-21_21.1.5~%2B%2B20251023083151%2B45afac62e373-1~exp1~20251023083333.51_amd64.deb -PACKAGES=('clang-21' 'clang-tools-21' 'libclang-common-21-dev' 'libclang-cpp21' 'libclang-rt-21-dev' 'libclang1-21' 'libllvm21' 'lld-21' 'llvm-21' 'llvm-21-dev' 'llvm-21-linker-tools' 'llvm-21-runtime' 'llvm-21-tools') +# https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-22/clang-22_22.1.0~%2B%2B20260223093050%2Bcd5897175d0d-1~exp1~20260223093246.28_amd64.deb +PACKAGES=('clang-22' 'clang-tools-22' 'libclang-common-22-dev' 'libclang-cpp22' 'libclang-rt-22-dev' 'libclang1-22' 'libllvm22' 'lld-22' 'llvm-22' 'llvm-22-dev' 'llvm-22-linker-tools' 'llvm-22-runtime' 'llvm-22-tools') FILES=() -URL='https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-21' -VERSION='21.1.5~%2B%2B20251023083151%2B45afac62e373-1~exp1~20251023083333.51_amd64.deb' +URL='https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-22' +VERSION='22.1.0~%2B%2B20260223093050%2Bcd5897175d0d-1~exp1~20260223093246.28_amd64.deb' apt-get install -y curl python3 for package in "${PACKAGES[@]}"; do diff --git a/llvm.sources b/llvm.sources index b3d915d..6cf73ae 100644 --- a/llvm.sources +++ b/llvm.sources @@ -1,4 +1,4 @@ Types: deb deb-src URIs: http://apt.llvm.org/bookworm/ -Suites: llvm-toolchain-bookworm-21 +Suites: llvm-toolchain-bookworm-22 Components: main