mirror of
https://github.com/nasa/fprime.git
synced 2025-12-10 17:47:10 -06:00
Fix typos in cross-compiling docs (#4280)
This commit is contained in:
parent
74dd80e2b7
commit
e34c019c3b
@ -72,8 +72,7 @@ Choose the operating system you are using to install F Prime:
|
|||||||
sudo "/Applications/CMake.app/Contents/bin/cmake-gui" --install
|
sudo "/Applications/CMake.app/Contents/bin/cmake-gui" --install
|
||||||
```
|
```
|
||||||
|
|
||||||
In order to cross-compile, a Linux box is essential. You may choose to use a virtual
|
In order to cross-compile, a Linux box is essential. You may choose to use a virtual machine or may choose to follow the instructions in [Appendix I](#appendix-i-installing-rancher-desktop-and-the-f-arm-container) to
|
||||||
machine or may choose to follow the instructions in [Appendix I](#appendix-i-installing-rancher-desktop-and-the-f-arm-container) to
|
|
||||||
install a docker container including the necessary tools.
|
install a docker container including the necessary tools.
|
||||||
|
|
||||||
=== "Ubuntu 20.04 / 22.04 / Generic Linux"
|
=== "Ubuntu 20.04 / 22.04 / Generic Linux"
|
||||||
@ -212,11 +211,11 @@ the logs scroll by when you initially `fprime-util generate <toolchain>`.
|
|||||||
|
|
||||||
## Appendix I: Installing Rancher Desktop and the F´ ARM Container
|
## Appendix I: Installing Rancher Desktop and the F´ ARM Container
|
||||||
|
|
||||||
Some users may with to run cross-compilers within docker to minimize the impact of those tools on their systems. Macintosh users will be required to use docker as the ARM/Linux cross-compilers are not available natively for macOS and simple virtualization of a Linux box is no longer practical since the introduction of M1 and M2 hardware.
|
Some users may wish to run cross-compilers within docker to minimize the impact of those tools on their systems. Macintosh users will be required to use docker as the ARM/Linux cross-compilers are not available natively for macOS and simple virtualization of a Linux box is no longer practical since the introduction of M1 and M2 hardware.
|
||||||
|
|
||||||
### Rancher Desktop Setup
|
### Rancher Desktop Setup
|
||||||
|
|
||||||
Rancher Desktop is an alternative to Docker Desktop that allows users to run docker containers directly on their desktop computer. It does not require a license for use like Docker Desktop does and also supports both intel and ARM based Macintosh computers.
|
Rancher Desktop is an alternative to Docker Desktop that allows users to run docker containers directly on their desktop computer. It does not require a license for use like Docker Desktop does and also supports both Intel and ARM based Macintosh computers.
|
||||||
|
|
||||||
> [!NOTE]
|
> [!NOTE]
|
||||||
> Non-Macintosh users are advised to run without the below Docker container
|
> Non-Macintosh users are advised to run without the below Docker container
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user