wasm-ld-path

===================================================================

Gbp-Pq: Topic wasm
Gbp-Pq: Name wasm-ld-path.diff

diff --git a/clang/lib/Driver/ToolChains/WebAssembly.h b/clang/lib/Driver/ToolChains/WebAssembly.h
index 5b9b8a0fe4e616fb19c28ee840393b51e39e50b3..72825768bc93dd8a8c1abcd89bf15f3d9b9636c1 100644 (file)
--- a/clang/lib/Driver/ToolChains/WebAssembly.h
+++ b/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 {
@@ -68,7 +72,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); }
 
   CXXStdlibType GetDefaultCXXStdlibType() const override {
     return ToolChain::CST_Libcxx;