Skip to content

Commit

Permalink
fix the toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
adamperkowski committed Dec 13, 2024
1 parent 46c00e5 commit b81cd9a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 29 deletions.
14 changes: 5 additions & 9 deletions README-it.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,19 @@ Un sistema operativo x86_64 (kernel) realizzato in Assembly e Rust.
- [Toolchain Rust](https://www.rust-lang.org/tools/install)

**Step:**
1. Installa la toolchain nightly:
1. Assicurati che `rustup` sia installato:
```bash
rustup toolchain install nightly
rustup --version
```
2. Installa i componenti necessari:
```bash
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu && rustup component add llvm-tools-preview --toolchain nightly-x86_64-unknown-linux-gnu && cargo install bootimage
```
3. Crea un clone locale di questa repository:
2. Crea un clone locale di questa repository:
```bash
git clone [email protected]:adamperkowski/highlightos.git && cd highlightos
```
4. `cd` dentro la cartella `kernel/`:
3. `cd` dentro la cartella `kernel/`:
```bash
cd kernel
```
5. Compila il file binario avviabile:
4. Compila il file binario avviabile:
```bash
cargo bootimage --release
```
Expand Down
16 changes: 6 additions & 10 deletions README-pl.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,19 @@ x86_64 System Operacyjny (kernel) zrobiony od zera w Assembly & Rust
- [Rust toolchain](https://www.rust-lang.org/tools/install)

**Kroki:**
1. Zainstaluj toolchain nightly:
1. Upewnij się że `rustup` jest zainstalowany:
```bash
rustup toolchain install nightly
rustup --version
```
2. Zainstaluj potrzebne komponenty:
```bash
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu && rustup component add llvm-tools-preview --toolchain nightly-x86_64-unknown-linux-gnu && cargo install bootimage
```
3. Stwórz lokalną kopię repozytorium:
2. Stwórz lokalną kopię repozytorium:
```bash
git clone [email protected]:adamperkowski/highlightos.git && cd highlightos
```
4. Użyj `cd` do folderu `kernel/` :
3. Użyj `cd` do folderu `kernel/`:
```bash
cd kernel
```
5. Zbuduj bootowalny plik binarny :
4. Zbuduj bootowalny plik binarny:
```bash
cargo bootimage --release
```
Expand All @@ -66,7 +62,7 @@ cargo bootimage --release
```bash
git clone [email protected]:adamperkowski/highlightos.git && cd highlightos
```
2. Użyj `cd` do folderu `asm/` :
2. Użyj `cd` do folderu `asm/`:
```bash
cd asm
```
Expand Down
14 changes: 5 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,19 @@ x86_64 OS (kernel) made completely from scratch in Assembly & Rust
- [Rust toolchain](https://www.rust-lang.org/tools/install)

**Steps:**
1. Install the nightly toolchain:
1. Make sure `rustup` is installed:
```bash
rustup toolchain install nightly
rustup --version
```
2. Install required components:
```bash
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu && rustup component add llvm-tools-preview --toolchain nightly-x86_64-unknown-linux-gnu && cargo install bootimage
```
3. Create a local clone of the repository:
2. Create a local clone of the repository:
```bash
git clone [email protected]:adamperkowski/highlightos.git && cd highlightos
```
4. `cd` into the `kernel/` directory:
3. `cd` into the `kernel/` directory:
```bash
cd kernel
```
5. Build the bootable binary:
4. Build the bootable binary:
```bash
cargo bootimage --release
```
Expand Down
5 changes: 4 additions & 1 deletion kernel/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
nightly-x86_64-unknown-linux-gnu
[toolchain]
channel = "nightly-2024-10-17"
components = [ "rustfmt", "rustc-dev", "rust-src", "llvm-tools-preview" ]
targets = [ "x86_64-unknown-linux-gnu" ]

0 comments on commit b81cd9a

Please sign in to comment.