Skip to content

Commit fd34963

Browse files
akoeplingerakoeplinger
committed
Replace a few hardcoded LLVM versions
1 parent d8afce7 commit fd34963

7 files changed

+13
-13
lines changed

‎llvm.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
<!-- Files previously marked for removal, which we want exceptions for (i.e. to keep after all) -->
255255
<ItemGroup>
256256
<FilesToDelete Remove="$(_LLVMInstallDir)/bin/clang-apply-replacements*" />
257-
<FilesToDelete Remove="$(_LLVMInstallDir)/bin/clang-19*" />
257+
<FilesToDelete Remove="$(_LLVMInstallDir)/bin/clang-$(LLVMVersionShort)*" />
258258
<FilesToDelete Remove="$(_LLVMInstallDir)/bin/clang-cl*" />
259259
<FilesToDelete Remove="$(_LLVMInstallDir)/bin/clang-cpp*" />
260260
<FilesToDelete Remove="$(_LLVMInstallDir)/bin/clang-format*" />

‎nuget/Microsoft.NETCore.Runtime.Mono.LLVM.Wasm.A.Transport/FreeBSD.Microsoft.NETCore.Runtime.Mono.LLVM.Wasm.A.Transport.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<ItemGroup>
44
<File Include="$(_LLVMInstallDir)\bin\clang" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
55
<File Include="$(_LLVMInstallDir)\bin\clang++" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
6-
<File Include="$(_LLVMInstallDir)\bin\clang-19" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7-
<File Include="$(_LLVMInstallDir)\bin\clang-19.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
6+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort)" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort).dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
88
<File Include="$(_LLVMInstallDir)\bin\clang-apply-replacements" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
99
<File Include="$(_LLVMInstallDir)\bin\clang-apply-replacements.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1010
<File Include="$(_LLVMInstallDir)\bin\clang-cl" TargetPath="tools\$(PackageTargetRuntime)\bin\" />

‎nuget/Microsoft.NETCore.Runtime.Mono.LLVM.Wasm.A.Transport/Linux.Microsoft.NETCore.Runtime.Mono.LLVM.Wasm.A.Transport.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<ItemGroup>
44
<File Include="$(_LLVMInstallDir)\bin\clang" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
55
<File Include="$(_LLVMInstallDir)\bin\clang++" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
6-
<File Include="$(_LLVMInstallDir)\bin\clang-19" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7-
<File Include="$(_LLVMInstallDir)\bin\clang-19.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
6+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort)" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort).dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
88
<File Include="$(_LLVMInstallDir)\bin\clang-apply-replacements" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
99
<File Include="$(_LLVMInstallDir)\bin\clang-apply-replacements.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1010
<File Include="$(_LLVMInstallDir)\bin\clang-cl" TargetPath="tools\$(PackageTargetRuntime)\bin\" />

‎nuget/Microsoft.NETCore.Runtime.Mono.LLVM.Wasm.A.Transport/OSX.Microsoft.NETCore.Runtime.Mono.LLVM.Wasm.A.Transport.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<ItemGroup>
44
<File Include="$(_LLVMInstallDir)\bin\clang" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
55
<File Include="$(_LLVMInstallDir)\bin\clang++" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
6-
<File Include="$(_LLVMInstallDir)\bin\clang-19" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7-
<File Include="$(_LLVMInstallDir)\bin\clang-19.dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
6+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort)" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort).dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
88
<File Include="$(_LLVMInstallDir)\bin\clang-apply-replacements" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
99
<File Include="$(_LLVMInstallDir)\bin\clang-apply-replacements.dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1010
<File Include="$(_LLVMInstallDir)\bin\clang-cl" TargetPath="tools\$(PackageTargetRuntime)\bin\" />

‎nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/FreeBSD.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<File Include="$(_LLVMInstallDir)\.emsdk_version" TargetPath="tools\$(PackageTargetRuntime)\" />
55
<File Include="$(_LLVMInstallDir)\bin\clang" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
66
<File Include="$(_LLVMInstallDir)\bin\clang++" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7-
<File Include="$(_LLVMInstallDir)\bin\clang-19" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
8-
<File Include="$(_LLVMInstallDir)\bin\clang-19.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort)" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
8+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort).dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
99
<File Include="$(_LLVMInstallDir)\bin\lld.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1010
<File Include="$(_LLVMInstallDir)\bin\llvm-addr2line" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1111
<File Include="$(_LLVMInstallDir)\bin\llvm-ar" TargetPath="tools\$(PackageTargetRuntime)\bin\" />

‎nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/Linux.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<File Include="$(_LLVMInstallDir)\.emsdk_version" TargetPath="tools\$(PackageTargetRuntime)\" />
55
<File Include="$(_LLVMInstallDir)\bin\clang" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
66
<File Include="$(_LLVMInstallDir)\bin\clang++" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7-
<File Include="$(_LLVMInstallDir)\bin\clang-19" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
8-
<File Include="$(_LLVMInstallDir)\bin\clang-19.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort)" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
8+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort).dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
99
<File Include="$(_LLVMInstallDir)\bin\lld.dbg" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1010
<File Include="$(_LLVMInstallDir)\bin\llvm-addr2line" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1111
<File Include="$(_LLVMInstallDir)\bin\llvm-ar" TargetPath="tools\$(PackageTargetRuntime)\bin\" />

‎nuget/Microsoft.NETCore.Runtime.Wasm.LLVM.Transport/OSX.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<File Include="$(_LLVMInstallDir)\.emsdk_version" TargetPath="tools\$(PackageTargetRuntime)\" />
55
<File Include="$(_LLVMInstallDir)\bin\clang" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
66
<File Include="$(_LLVMInstallDir)\bin\clang++" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7-
<File Include="$(_LLVMInstallDir)\bin\clang-19" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
8-
<File Include="$(_LLVMInstallDir)\bin\clang-19.dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
7+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort)" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
8+
<File Include="$(_LLVMInstallDir)\bin\clang-$(LLVMVersionShort).dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
99
<File Include="$(_LLVMInstallDir)\bin\lld.dwarf" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1010
<File Include="$(_LLVMInstallDir)\bin\llvm-addr2line" TargetPath="tools\$(PackageTargetRuntime)\bin\" />
1111
<File Include="$(_LLVMInstallDir)\bin\llvm-ar" TargetPath="tools\$(PackageTargetRuntime)\bin\" />

0 commit comments

Comments
 (0)