Use the version suffix when calling wasm-ld => wasm-ld-13 https://bugzilla.mozilla.org/show_bug.cgi?id=1747145

debian/changelog

@@ -7,6 +7,8 @@ llvm-toolchain-13 (1:13.0.1~+rc1-1~exp2) experimental; urgency=medium
     https://github.com/llvm/llvm-project/issues/42339
   * Remove AVR from LLVM_EXPERIMENTAL_TARGETS_TO_BUILD. stable since 11
     https://releases.llvm.org/11.0.0/docs/ReleaseNotes.html#changes-to-the-avr-target
+  * Use the version suffix when calling wasm-ld => wasm-ld-13
+    https://bugzilla.mozilla.org/show_bug.cgi?id=1747145
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 16 Dec 2021 14:28:09 +0100
 

debian/patches/series

@@ -151,3 +151,4 @@ llvm-runtimes-builtins-build-check.diff
 compilerrt-builtins-arch-fix-armhf.diff
 compilerrt-build-scudo-standalone-option.diff
 use-gold-for-compiler-rt-when-set.diff
+wasm-ld-path.diff

debian/patches/wasm-ld-path.diff

@@ -0,0 +1,27 @@
+Index: llvm-toolchain-13-13.0.1~+rc1/clang/lib/Driver/ToolChains/WebAssembly.h
+===================================================================
+--- llvm-toolchain-13-13.0.1~+rc1.orig/clang/lib/Driver/ToolChains/WebAssembly.h
++++ llvm-toolchain-13-13.0.1~+rc1/clang/lib/Driver/ToolChains/WebAssembly.h
+@@ -10,9 +10,13 @@
+ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H
+ 
+ #include "Gnu.h"
++#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR
+ #include "clang/Driver/Tool.h"
+ #include "clang/Driver/ToolChain.h"
+ 
++#define TOSTR2(X) #X
++#define TOSTR(X) TOSTR2(X)
++
+ namespace clang {
+ namespace driver {
+ namespace tools {
+@@ -67,7 +71,7 @@ private:
+                            llvm::opt::ArgStringList &CmdArgs) const override;
+   SanitizerMask getSupportedSanitizers() const override;
+ 
+-  const char *getDefaultLinker() const override { return "wasm-ld"; }
++  const char *getDefaultLinker() const override { return "wasm-ld-" TOSTR(LLVM_VERSION_MAJOR); }
+ 
+   Tool *buildLinker() const override;
+