Skip to content

Commit b77d45f

Browse files
authored
Unrolled build for #147824
Rollup merge of #147824 - moturus:motor-os-docs, r=Urgau docs: update Motor OS target docs Update the docs to reflect that [Motor OS std library PR](#147000) has been merged.
2 parents 32892a3 + 2e33760 commit b77d45f

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

src/doc/rustc/src/platform-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ target | std | host | notes
432432
`x86_64-unknown-l4re-uclibc` | ? | |
433433
[`x86_64-unknown-linux-none`](platform-support/x86_64-unknown-linux-none.md) | * | | 64-bit Linux with no libc
434434
[`x86_64-unknown-managarm-mlibc`](platform-support/managarm.md) | ? | | x86_64 Managarm
435-
[`x86_64-unknown-motor`](platform-support/motor.md) | ? | | x86_64 Motor OS
435+
[`x86_64-unknown-motor`](platform-support/motor.md) | | | x86_64 Motor OS
436436
[`x86_64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 64-bit OpenBSD
437437
[`x86_64-unknown-trusty`](platform-support/trusty.md) | ✓ | |
438438
`x86_64-uwp-windows-gnu` | ✓ | |

src/doc/rustc/src/platform-support/motor.md

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,35 @@ This target is cross-compiled. There are no special requirements for the host.
1515

1616
Motor OS uses the ELF file format.
1717

18-
## Building the target
18+
## Building the target toolchain
1919

20-
The target can be built by enabling it for a `rustc` build, for example:
20+
Motor OS target toolchain can be
21+
[built using `x.py`](https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html):
22+
23+
The bootstrap file:
2124

2225
```toml
2326
[build]
24-
build-stage = 2
25-
target = ["x86_64-unknown-motor"]
27+
host = ["x86_64-unknown-linux-gnu"]
28+
target = ["x86_64-unknown-linux-gnu", "x86_64-unknown-motor"]
29+
```
30+
31+
The build command:
32+
33+
```sh
34+
./x.py build --stage 2 clippy library
2635
```
2736

2837
## Building Rust programs
2938

30-
Rust standard library is fully supported/implemented, but is not yet part of
31-
the official Rust repo, so an out-of-tree building process should be
32-
followed, as described in the
33-
[build doc](https://github.com/moturus/motor-os/blob/main/docs/build.md).
39+
See the [Hello Motor OS](https://github.com/moturus/motor-os/blob/main/docs/recipes/hello-motor-os.md)
40+
example.
3441

3542
## Testing
3643

3744
Cross-compiled Rust binaries and test artifacts can be executed in Motor OS VMs,
38-
as described in e.g.
45+
as described in the [build doc](https://github.com/moturus/motor-os/blob/main/docs/build.md)
46+
and the
3947
[Hello Motor OS](https://github.com/moturus/motor-os/blob/main/docs/recipes/hello-motor-os.md)
4048
example.
4149

0 commit comments

Comments
 (0)