Skip to content

Commit 80bc75c

Browse files
authored
v1.85.1 (#34)
- debian 12.10 - rust 1.85.1 - tpoechtrager/osxcross#d0376b1
1 parent be243c8 commit 80bc75c

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NOTE: Most of Dockerfile and related were borrowed from https://hub.docker.com/r/ekidd/rust-musl-builder
22

3-
FROM debian:12.9-slim
3+
FROM debian:12.10-slim
44

55
ARG VERSION=0.0.0
66
ENV VERSION=${VERSION}
@@ -174,7 +174,7 @@ ARG OSX_SDK_SUM=518e35eae6039b3f64e8025f4525c1c43786cc5cf39459d609852faf091e34be
174174
ARG OSX_VERSION_MIN=10.14
175175

176176
# OS X Cross - https://github.com/tpoechtrager/osxcross
177-
ARG OSX_CROSS_COMMIT=29fe6dd35522073c9df5800f8cd1feb4b9a993a8
177+
ARG OSX_CROSS_COMMIT=d0376b1c368055bd7ce26da97b86b7fbff2814f1
178178

179179
# Install OS X Cross
180180
# A Mac OS X cross toolchain for Linux, FreeBSD, OpenBSD and Android
@@ -203,7 +203,7 @@ RUN set -eux \
203203
&& env DISABLE_PARALLEL_ARCH_BUILD=1 ./build_compiler_rt.sh \
204204
&& true
205205

206-
ENV PATH $PATH:/usr/local/osxcross/target/bin
206+
ENV PATH=$PATH:/usr/local/osxcross/target/bin
207207
ENV MACOSX_DEPLOYMENT_TARGET=${OSX_VERSION_MIN}
208208
ENV OSXCROSS_MACPORTS_MIRROR=https://packages.macports.org
209209

@@ -220,7 +220,7 @@ RUN set -eux \
220220
&& true
221221

222222
# Rust stable toolchain
223-
ARG TOOLCHAIN=1.84.1
223+
ARG TOOLCHAIN=1.85.1
224224

225225
# Install our Rust toolchain and the `musl` target. We patch the
226226
# command-line we pass to the installer so that it won't attempt to

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Below are the default toolchains included in the Docker image.
4242
docker run --rm \
4343
--volume "${PWD}/sample":/root/src \
4444
--workdir /root/src \
45-
joseluisq/rust-linux-darwin-builder:1.84.1 \
45+
joseluisq/rust-linux-darwin-builder:1.85.1 \
4646
sh -c "cargo build --release --target x86_64-unknown-linux-musl"
4747
```
4848

@@ -52,7 +52,7 @@ docker run --rm \
5252
docker run --rm \
5353
--volume "${PWD}/sample":/root/src \
5454
--workdir /root/src \
55-
joseluisq/rust-linux-darwin-builder:1.84.1 \
55+
joseluisq/rust-linux-darwin-builder:1.85.1 \
5656
sh -c "cargo build --release --target x86_64-unknown-linux-gnu"
5757
```
5858

@@ -62,7 +62,7 @@ docker run --rm \
6262
docker run --rm \
6363
--volume "${PWD}/sample":/root/src \
6464
--workdir /root/src \
65-
joseluisq/rust-linux-darwin-builder:1.84.1 \
65+
joseluisq/rust-linux-darwin-builder:1.85.1 \
6666
sh -c "cargo build --release --target x86_64-apple-darwin"
6767
```
6868

@@ -74,7 +74,7 @@ docker run --rm \
7474
docker run --rm \
7575
--volume "${PWD}/sample":/root/src \
7676
--workdir /root/src \
77-
joseluisq/rust-linux-darwin-builder:1.84.1 \
77+
joseluisq/rust-linux-darwin-builder:1.85.1 \
7878
sh -c "cargo build --release --target aarch64-unknown-linux-gnu"
7979
```
8080

@@ -84,7 +84,7 @@ docker run --rm \
8484
docker run --rm \
8585
--volume "${PWD}/sample":/root/src \
8686
--workdir /root/src \
87-
joseluisq/rust-linux-darwin-builder:1.84.1 \
87+
joseluisq/rust-linux-darwin-builder:1.85.1 \
8888
sh -c "cargo build --release --target aarch64-unknown-linux-musl"
8989
```
9090

@@ -94,7 +94,7 @@ docker run --rm \
9494
docker run --rm \
9595
--volume "${PWD}/sample":/root/src \
9696
--workdir /root/src \
97-
joseluisq/rust-linux-darwin-builder:1.84.1 \
97+
joseluisq/rust-linux-darwin-builder:1.85.1 \
9898
sh -c "cargo build --release --target aarch64-apple-darwin"
9999
```
100100

@@ -107,7 +107,7 @@ It's known that the [`CARGO_HOME`](https://doc.rust-lang.org/cargo/guide/cargo-h
107107
You can also use the image as a base for your Dockerfile:
108108

109109
```Dockerfile
110-
FROM joseluisq/rust-linux-darwin-builder:1.84.1
110+
FROM joseluisq/rust-linux-darwin-builder:1.85.1
111111
```
112112

113113
### OSXCross
@@ -150,7 +150,7 @@ compile:
150150
@docker run --rm -it \
151151
-v $(PWD):/app/src \
152152
-w /app/src \
153-
joseluisq/rust-linux-darwin-builder:1.84.1 \
153+
joseluisq/rust-linux-darwin-builder:1.85.1 \
154154
make cross-compile
155155
.PHONY: compile
156156

@@ -173,13 +173,13 @@ Just run the makefile `compile` target, then you will see two release binaries `
173173

174174
```sh
175175
make compile
176-
# rustc 1.84.1 (e71f9a9a9 2025-01-27)
176+
# rustc 1.85.1 (4eb161250 2025-03-15)
177177
# binary: rustc
178-
# commit-hash: e71f9a9a98b0faf423844bf0ba7438f29dc27d58
179-
# commit-date: 2025-01-27
178+
# commit-hash: 4eb161250e340c8f48f66e2b929ef4a5bed7c181
179+
# commit-date: 2025-03-15
180180
# host: x86_64-unknown-linux-gnu
181-
# release: 1.84.1
182-
# LLVM version: 19.1.5
181+
# release: 1.85.1
182+
# LLVM version: 19.1.7
183183

184184
# 2. Compiling application (linux-musl x86_64)...
185185
# Finished release [optimized] target(s) in 0.01s

0 commit comments

Comments
 (0)