Skip to content

Commit dc7e26d

Browse files
committed
v1.62.0
1 parent 9769e82 commit dc7e26d

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/devel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
-
1313
name: Checkout
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515
-
1616
name: Cache Docker layers
1717
uses: mattes/cached-docker-build-action@v1

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
-
1313
name: Checkout
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515
-
1616
name: Docker meta
1717
id: meta

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ It contains essential tools for cross-compile [Rust](https://www.rust-lang.org/)
3030

3131
### Compiling an application inside a Docker container
3232

33-
By default the working directory is `/root/src`.
33+
By default, the working directory is `/root/src`.
3434

3535
#### x86_64-unknown-linux-musl
3636

@@ -56,19 +56,19 @@ docker run --rm \
5656

5757
### Cargo Home advice
5858

59-
It's known that the [`CARGO_HOME`](https://doc.rust-lang.org/cargo/guide/cargo-home.html#cargo-home) points to `$HOME/.cargo` by default (`/root/.cargo` in this case). However if you want to use a custom Cargo home directory then make sure to copy the Cargo `config` file to the particular directory like `cp "$HOME/.cargo/config" "$CARGO_HOME/"` before to cross-compile your program. Otherwise you could face a linking error when for example you want to cross-compile to an `x86_64-apple-darwin` target.
59+
It's known that the [`CARGO_HOME`](https://doc.rust-lang.org/cargo/guide/cargo-home.html#cargo-home) points to `$HOME/.cargo` by default (`/root/.cargo` in this case). However, if you want to use a custom Cargo home directory then make sure to copy the Cargo `config` file to the particular directory like `cp "$HOME/.cargo/config" "$CARGO_HOME/"` before to cross-compile your program. Otherwise, you could face a linking error when for example you want to cross-compile to an `x86_64-apple-darwin` target.
6060

6161
### Dockerfile
6262

63-
You can also use the image as a base for your own Dockerfile:
63+
You can also use the image as a base for your Dockerfile:
6464

6565
```Dockerfile
6666
FROM joseluisq/rust-linux-darwin-builder:1.61.0
6767
```
6868

6969
### OSXCross
7070

71-
You can also use o32-clang(++) and o64-clang(++) like a normal compiler.
71+
You can also use o32-clang(++) and o64-clang(++) as a normal compiler.
7272

7373
__Notes:__
7474

@@ -92,12 +92,12 @@ Example 4: x86_64-apple-darwin21.4-strip -x test
9292

9393
### Cross-compilation example
9494

95-
Below a simple example using a `Makefile` for cross-compiling a Rust app.
95+
Below is a simple example of using a `Makefile`` for cross-compiling a Rust app.
9696

9797
Notes:
9898

9999
- A [hello world](./tests/hello-world) app is used.
100-
- A custom directory is used below as working directory instead of `/root/src`.
100+
- A custom directory is used below as a working directory instead of `/root/src`.
101101

102102
Create a Makefile:
103103

@@ -131,13 +131,13 @@ Just run the makefile `compile` target, then you will see two release binaries `
131131
make compile
132132
# 1. Cross compiling example...
133133

134-
# rustc 1.61.0 (fe5b13d68 2022-05-18)
134+
# rustc 1.62.0 (a8314ef7d 2022-06-27)
135135
# binary: rustc
136-
# commit-hash: fe5b13d681f25ee6474be29d748c65adcd91f69e
137-
# commit-date: 2022-05-18
136+
# commit-hash: a8314ef7d0ec7b75c336af2c9857bfaf43002bfc
137+
# commit-date: 2022-06-27
138138
# host: x86_64-unknown-linux-gnu
139-
# release: 1.61.0
140-
# LLVM version: 14.0.0
139+
# release: 1.62.0
140+
# LLVM version: 14.0.5
141141

142142
# 2. Compiling application (linux-musl x86_64)...
143143
# Finished release [optimized] target(s) in 0.01s
@@ -152,15 +152,15 @@ make compile
152152

153153
If some of your crates require C bindings and you run into compilation or linking errors, try to use Clang for C/C++ builds.
154154

155-
For example to cross compile to Macos:
155+
For example to cross-compile to Macos:
156156

157157
```sh
158158
CC=o64-clang \
159159
CXX=o64-clang++ \
160160
cargo build --target x86_64-apple-darwin
161161
```
162162

163-
For more details take a look at [Cross compiling Rust from Linux to macOS](https://wapl.es/rust/2019/02/17/rust-cross-compile-linux-to-macos.html) by James Waples.
163+
For more details take a look at Cross-compiling Rust from Linux to macOS](https://wapl.es/rust/2019/02/17/rust-cross-compile-linux-to-macos.html) by James Waples.
164164

165165
### OpenSSL release advice
166166

0 commit comments

Comments
 (0)