From 0448f58d82201d2a7360c3f995197313abf70937 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Sun, 26 Sep 2021 10:05:43 -0700 Subject: [PATCH] chore(x86_64): switch to linking with `ld` for now this fixes the build on recent nightlies --- it appears the linker hax we use for tests breaks on recent `rust-lld`s due to upstream changes. see https://github.com/dtolnay/linkme/issues/41 for details on a similar issue. Signed-off-by: Eliza Weisman --- x86_64-mycelium.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x86_64-mycelium.json b/x86_64-mycelium.json index 2a7cf8a0..8584315f 100644 --- a/x86_64-mycelium.json +++ b/x86_64-mycelium.json @@ -8,9 +8,8 @@ "code-model": "kernel", "os": "none", "executables": true, - "linker-flavor": "ld.lld", - "linker": "rust-lld", + "linker-flavor": "ld", "panic-strategy": "abort", "disable-redzone": true, "features": "-mmx,-sse,+soft-float" -} +} \ No newline at end of file