From 7e9763f69d1d6b92223fc932af149c82274b8ed7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 4 Feb 2022 08:24:04 +0100 Subject: [PATCH] rebase of the patch --- debian/patches/wasm-ld-path.diff | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/patches/wasm-ld-path.diff b/debian/patches/wasm-ld-path.diff index 726ca1a8..aa5930fc 100644 --- a/debian/patches/wasm-ld-path.diff +++ b/debian/patches/wasm-ld-path.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-13-13.0.1~+rc1/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608/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 +--- llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608/clang/lib/Driver/ToolChains/WebAssembly.h @@ -10,9 +10,13 @@ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H @@ -16,12 +16,12 @@ Index: llvm-toolchain-13-13.0.1~+rc1/clang/lib/Driver/ToolChains/WebAssembly.h namespace clang { namespace driver { namespace tools { -@@ -67,7 +71,7 @@ private: +@@ -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); } - Tool *buildLinker() const override; - + CXXStdlibType GetDefaultCXXStdlibType() const override { + return ToolChain::CST_Libcxx;