diff --git a/debian/patches/wasm/wasm-ld-path.diff b/debian/patches/wasm/wasm-ld-path.diff index 5617766b..4a192d0d 100644 --- a/debian/patches/wasm/wasm-ld-path.diff +++ b/debian/patches/wasm/wasm-ld-path.diff @@ -1,27 +1,25 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h -@@ -10,9 +10,13 @@ - #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H +--- llvm-toolchain-snapshot_19~++20240319094628+703920d4138d.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -20,6 +20,11 @@ + #include "llvm/Support/Path.h" + #include "llvm/Support/VirtualFileSystem.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; + using namespace clang::driver; + using namespace clang::driver::tools; + using namespace clang::driver::toolchains; +@@ -241,7 +246,7 @@ WebAssembly::WebAssembly(const Driver &D + const char *WebAssembly::getDefaultLinker() const { + if (getOS() == "wasip2") + return "wasm-component-ld"; +- return "wasm-ld"; ++ return "wasm-ld-" TOSTR(LLVM_VERSION_MAJOR); + } -- 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; + bool WebAssembly::IsMathErrnoDefault() const { return false; }