From d6e31f5b29c46b9ac99ff747be0628fc55840cf7 Mon Sep 17 00:00:00 2001
From: Jo Shields <directhex@apebox.org>
Date: Thu, 27 Apr 2023 13:43:58 -0400
Subject: [PATCH] `lld` is useless, it changes behaviour based on binary name
 (#405)

---
 .../Linux.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props   | 2 +-
 .../OSX.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props     | 2 +-
 ...ndows_NT.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Linux.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props b/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Linux.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
index 658b392e3031d..898fccb3af900 100644
--- a/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Linux.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
+++ b/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Linux.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
@@ -6,7 +6,6 @@
     <File Include="$(_LLVMInstallDir)\bin\clang++" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\clang-14" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\clang-14.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
-    <File Include="$(_LLVMInstallDir)\bin\lld" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\lld.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-addr2line" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-ar" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
@@ -33,6 +32,7 @@
     <File Include="$(_LLVMInstallDir)\bin\llvm-strip" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-symbolizer" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-symbolizer.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
+    <File Include="$(_LLVMInstallDir)\bin\wasm-ld" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\lib\clang\include\**" TargetPath="tools\$(PackageTargetRuntime)\lib\clang\include\%(RecursiveDir)\" />
   </ItemGroup>
 </Project>
diff --git a/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/OSX.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props b/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/OSX.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
index 4e4d3febc4ce9..d4379521654cb 100644
--- a/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/OSX.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
+++ b/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/OSX.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
@@ -6,7 +6,6 @@
     <File Include="$(_LLVMInstallDir)\bin\clang++" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\clang-14" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\clang-14.dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
-    <File Include="$(_LLVMInstallDir)\bin\lld" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\lld.dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-addr2line" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-ar" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
@@ -33,6 +32,7 @@
     <File Include="$(_LLVMInstallDir)\bin\llvm-strip" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-symbolizer" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-symbolizer.dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
+    <File Include="$(_LLVMInstallDir)\bin\wasm-ld" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\lib\clang\include\**" TargetPath="tools\$(PackageTargetRuntime)\lib\clang\include\%(RecursiveDir)\" />
   </ItemGroup>
 </Project>
diff --git a/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Windows_NT.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props b/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Windows_NT.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
index 64382b7806b61..a86a4a379bbcf 100644
--- a/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Windows_NT.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
+++ b/nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Windows_NT.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props
@@ -4,7 +4,6 @@
     <File Include="$(_LLVMInstallDir)\bin\clang.exe" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\clang.pdb" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\clang++.exe" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
-    <File Include="$(_LLVMInstallDir)\bin\lld.exe" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\lld.pdb" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-addr2line.exe" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-ar.exe" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
@@ -31,6 +30,7 @@
     <File Include="$(_LLVMInstallDir)\bin\llvm-strip.exe" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-symbolizer.exe" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\bin\llvm-symbolizer.pdb" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
+    <File Include="$(_LLVMInstallDir)\bin\wasm-ld.exe" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
     <File Include="$(_LLVMInstallDir)\lib\clang\include\**" TargetPath="tools\$(PackageTargetRuntime)\lib\clang\include\%(RecursiveDir)\" />
   </ItemGroup>
 </Project>