Skip to content

Commit 198df57

Browse files
committed
v1.54.0
1 parent 6a5e6fe commit 198df57

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ test:
1313
.PHONY: test
1414

1515
test-ci:
16-
@echo "Testing application..."
16+
@echo "Testing cross-compiling application..."
1717
@rustc -vV
1818
@echo
1919
@cd tests/hello-world \
20-
&& echo "Compiling application(linux-musl x86_64)..." \
20+
&& echo "Compiling application (linux-musl x86_64)..." \
2121
&& cargo build --release --target x86_64-unknown-linux-musl \
2222
&& du -sh target/x86_64-unknown-linux-musl/release/helloworld \
2323
&& echo \
24-
&& echo "Compiling application(apple-darwin x86_64)..." \
24+
&& echo "Compiling application (apple-darwin x86_64)..." \
2525
&& cargo build --release --target x86_64-apple-darwin \
2626
&& du -sh target/x86_64-apple-darwin/release/helloworld
2727
.ONESHELL: test-ci

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ By default the working directory is `/root/src`.
2626
docker run --rm \
2727
--volume "${PWD}/sample":/root/src \
2828
--workdir /root/src \
29-
joseluisq/rust-linux-darwin-builder:1.53.0 \
29+
joseluisq/rust-linux-darwin-builder:1.54.0 \
3030
sh -c "cargo build --release"
3131
```
3232

@@ -36,7 +36,7 @@ docker run --rm \
3636
docker run --rm \
3737
--volume "${PWD}/sample":/root/src \
3838
--workdir /root/src \
39-
joseluisq/rust-linux-darwin-builder:1.53.0 \
39+
joseluisq/rust-linux-darwin-builder:1.54.0 \
4040
sh -c "cargo build --release --target x86_64-apple-darwin"
4141
```
4242

@@ -45,7 +45,7 @@ docker run --rm \
4545
You can also use the image as a base for your own Dockerfile:
4646

4747
```Dockerfile
48-
FROM joseluisq/rust-linux-darwin-builder:1.53.0
48+
FROM joseluisq/rust-linux-darwin-builder:1.54.0
4949
```
5050

5151
### OSXCross
@@ -54,22 +54,22 @@ You can also use o32-clang(++) and o64-clang(++) like a normal compiler.
5454

5555
__Notes:__
5656

57-
- The current *11.1 SDK* does not support i386 anymore. Use <= 10.13 SDK if you rely on i386 support.
58-
- The current *11.1 SDK* does not support libstdc++ anymore. Use <= 10.13 SDK if you rely on libstdc++ support.
57+
- The current *11.3 SDK* does not support i386 anymore. Use <= 10.13 SDK if you rely on i386 support.
58+
- The current *11.3 SDK* does not support libstdc++ anymore. Use <= 10.13 SDK if you rely on libstdc++ support.
5959

6060
Examples:
6161

6262
```sh
6363
Example usage:
6464

65-
Example 1: CC=o32-clang ./configure --host=i386-apple-darwin20.2
66-
Example 2: CC=i386-apple-darwin20.2-clang ./configure --host=i386-apple-darwin20.2
65+
Example 1: CC=o32-clang ./configure --host=i386-apple-darwin20.4
66+
Example 2: CC=i386-apple-darwin20.4-clang ./configure --host=i386-apple-darwin20.4
6767
Example 3: o64-clang -Wall test.c -o test
68-
Example 4: x86_64-apple-darwin20.2-strip -x test
68+
Example 4: x86_64-apple-darwin20.4-strip -x test
6969

70-
!!! Use aarch64-apple-darwin20.2-* instead of arm64-* when dealing with Automake !!!
71-
!!! CC=aarch64-apple-darwin20.2-clang ./configure --host=aarch64-apple-darwin20.2 !!!
72-
!!! CC="aarch64-apple-darwin20.2-clang -arch arm64e" ./configure --host=aarch64-apple-darwin20.2 !!!
70+
!!! Use aarch64-apple-darwin20.4-* instead of arm64-* when dealing with Automake !!!
71+
!!! CC=aarch64-apple-darwin20.4-clang ./configure --host=aarch64-apple-darwin20.4 !!!
72+
!!! CC="aarch64-apple-darwin20.4-clang -arch arm64e" ./configure --host=aarch64-apple-darwin20.4 !!!
7373
```
7474

7575
### Cross-compilation example

docker/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ ARG TOOLCHAIN=stable
1616

1717
# OpenSSL v1.1.1
1818
# https://www.openssl.org/source/old/1.1.1/
19-
ARG OPENSSL_VERSION=1.1.1k
19+
ARG OPENSSL_VERSION=1.1.1j
2020

2121
# zlib - http://zlib.net/
2222
ARG ZLIB_VERSION=1.2.11
2323

2424
# libpq - https://ftp.postgresql.org/pub/source/
25-
ARG POSTGRESQL_VERSION=13.2
25+
ARG POSTGRESQL_VERSION=13.3
2626

2727
# Mac OS X SDK version
28-
ARG OSX_SDK_VERSION=11.1
29-
ARG OSX_SDK_SUM=97a916b0b68aae9dcd32b7d12422ede3e5f34db8e169fa63bfb18ec410b8f5d9
28+
ARG OSX_SDK_VERSION=11.3
29+
ARG OSX_SDK_SUM=9adc1373d3879e1973d28ad9f17c9051b02931674a3ec2a2498128989ece2cb1
3030
ARG OSX_VERSION_MIN=10.14
3131

3232
# OS X Cross
33-
ARG OSX_CROSS_COMMIT=8a716a43a72dab1db9630d7824ee0af3730cb8f9
33+
ARG OSX_CROSS_COMMIT=de6c72eff2d6013f5af46fba1fa205654c5cf5e2
3434

3535
# Make sure we have basic dev tools for building C libraries. Our goal
3636
# here is to support the musl-libc builds and Cargo builds needed for a

docker/cargo-config.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ target = "x86_64-unknown-linux-musl"
66
linker = "arm-linux-gnueabihf-gcc"
77

88
[target.x86_64-apple-darwin]
9-
linker = "x86_64-apple-darwin20.2-clang"
10-
ar = "x86_64-apple-darwin20.2-ar"
9+
linker = "x86_64-apple-darwin20.4-clang"
10+
ar = "x86_64-apple-darwin20.4-ar"

0 commit comments

Comments
 (0)