Skip to content
This repository was archived by the owner on Apr 6, 2020. It is now read-only.

Commit ee62e49

Browse files
committed
use correct lld
rust-lang/rust#51936
1 parent 5dc9011 commit ee62e49

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

second-edition/src/appendix/target-specifications.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ We're not using C, so this doesn't matter, but if we were, we'd make integers
5858
We don't have an OS! We're building one!
5959

6060
```json
61+
"linker": "rust-lld",
6162
"linker-flavor": "ld.lld",
6263
```
6364

second-edition/src/hello-world/setting-up-a-project.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ Create a new file named `intermezzos.json` and put this in it:
9797
"target-pointer-width": "64",
9898
"target-c-int-width": "32",
9999
"os": "none",
100+
"linker": "rust-lld",
100101
"linker-flavor": "ld.lld",
101102
"executables": true,
102103
"features": "-mmx,-sse,+soft-float",
@@ -345,4 +346,4 @@ documentation](https://github.com/rust-osdev/bootimage#configuration).
345346

346347
Congrats! This is the first step on our journey building operating systems.
347348
It only gets cooler from here. But before we move on, let's take a step back
348-
and investigate in a bit more depth what we actually just did.
349+
and investigate in a bit more depth what we actually just did.

0 commit comments

Comments
 (0)