From d7e17b2f56ba2c12b256e3e79673ac5d8b63a7de Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 6 Mar 2018 09:49:45 +0100 Subject: [PATCH] Set `linker-flavor` to `ld.lld`, leave `linker` at default --- .../second-edition/posts/02-minimal-rust-kernel/index.md | 5 ++--- x86_64-blog_os.json | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md b/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md index 3cfa8c48..a6593467 100644 --- a/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md +++ b/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md @@ -132,11 +132,10 @@ We add the following build-related entries: ```json -"linker-flavor": "ld", -"linker": "ld.lld", +"linker-flavor": "ld.lld", ``` -Instead of using the platform's default linker (which might not support Linux targets), we use the cross platform [LLD] linker for linking our kernel. +Instead of using the platform's default linker (which might not support Linux targets), we use the cross platform [LLD] linker for linking our kernel. LLD is shipped with Rust since the `2018-03-05` nightly. [LLD]: https://lld.llvm.org/ diff --git a/x86_64-blog_os.json b/x86_64-blog_os.json index c8c39b29..83d1a54d 100644 --- a/x86_64-blog_os.json +++ b/x86_64-blog_os.json @@ -6,8 +6,7 @@ "target-pointer-width": "64", "target-c-int-width": "32", "os": "none", - "linker-flavor": "ld", - "linker": "ld.lld", + "linker-flavor": "ld.lld", "executables": true, "features": "-mmx,-sse,+soft-float", "disable-redzone": true,