Update several dependencies
This commit is contained in:
+4
-8
@@ -1,7 +1,7 @@
|
||||
# This Dockerfile produces a base image for builds.
|
||||
# It includes all dependencies necessary to cross-compile for Windows/MacOS/Linux.
|
||||
|
||||
FROM debian:bookworm AS osxcross
|
||||
FROM debian:trixie AS osxcross
|
||||
ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
|
||||
WORKDIR /build/osxcross
|
||||
ADD "https://github.com/tpoechtrager/osxcross.git#47936a512273bb3b414b5a2e83043c92eabc7ae7" .
|
||||
@@ -9,25 +9,21 @@ ADD "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.
|
||||
RUN apt-get update && \
|
||||
apt-get install -y ca-certificates
|
||||
COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
|
||||
COPY install-llvm.sh .
|
||||
RUN apt-get update && \
|
||||
./install-llvm.sh && \
|
||||
apt-get install -y bash bzip2 git make patch xz-utils && \
|
||||
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 && \
|
||||
SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
|
||||
|
||||
FROM rust:1.95-bookworm
|
||||
FROM rust:1.97-trixie
|
||||
ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
|
||||
COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
|
||||
COPY install-llvm.sh .
|
||||
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 && \
|
||||
./install-llvm.sh && \
|
||||
apt-get install -y libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
|
||||
apt-get install -y clang-22 lld-22 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
|
||||
cargo install cargo-bundle xwin && \
|
||||
xwin --accept-license splat --output xwin && \
|
||||
rm -rf .xwin-cache && \
|
||||
|
||||
Reference in New Issue
Block a user