summaryrefslogtreecommitdiffstats
path: root/source/d/rust
diff options
context:
space:
mode:
Diffstat (limited to 'source/d/rust')
-rw-r--r--source/d/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch24
-rwxr-xr-xsource/d/rust/rust.SlackBuild2
2 files changed, 26 insertions, 0 deletions
diff --git a/source/d/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch b/source/d/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch
new file mode 100644
index 000000000..352889919
--- /dev/null
+++ b/source/d/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 6 Nov 2021 22:42:06 +0100
+Subject: [PATCH] compiler: Use wasm-ld for wasm targets
+
+We don't ship rust-lld.
+---
+ compiler/rustc_target/src/spec/base/wasm.rs | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
+index 4b4d2aca26e4..b4918c8fdda2 100644
+--- a/compiler/rustc_target/src/spec/base/wasm.rs
++++ b/compiler/rustc_target/src/spec/base/wasm.rs
+@@ -88,8 +88,7 @@ macro_rules! args {
+ // arguments just yet
+ limit_rdylib_exports: false,
+
+- // we use the LLD shipped with the Rust toolchain by default
+- linker: Some("rust-lld".into()),
++ linker: Some("wasm-ld".into()),
+ linker_flavor: LinkerFlavor::WasmLld(Cc::No),
+
+ pre_link_args,
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 8db63d3f3..859c35401 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -143,6 +143,8 @@ if [ "${SYSTEM_LLVM}" = "YES" ]; then
zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose || exit 1
fi
+cat $CWD/0004-compiler-Use-wasm-ld-for-wasm-targets.patch | patch -p1 --verbose || exit 1
+
if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then
# rust requires bootstrapping with the previous rust version.
# versions are defined in src/stage0.txt.