Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Lapounov <antonl@microsoft.com>2021-03-04 07:13:29 +0300
committerGitHub <noreply@github.com>2021-03-04 07:13:29 +0300
commite6fa0f53f06c94d458e2aa4d6ee6cb4686863158 (patch)
tree4652b83c9bbb307f2ab356f948744a9f478b6301 /src/coreclr/ToolBox
parentadd68df26af8c0dab2afb13da1f0ca033753fd0b (diff)
Fix DacTableGen build on Windows ARM64 (#49093)
Diffstat (limited to 'src/coreclr/ToolBox')
-rw-r--r--src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj b/src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj
index e911b8091cd..1217406b7b1 100644
--- a/src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj
+++ b/src/coreclr/ToolBox/SOS/DacTableGen/DacTableGen.csproj
@@ -24,8 +24,16 @@
<Output TaskParameter="ConsoleOutput" PropertyName="VSInstallationPath" />
</Exec>
+ <PropertyGroup>
+ <_MsDiaSubDir>$(BuildArchitecture)</_MsDiaSubDir>
+ <_MsDiaSubDir Condition="'$(BuildArchitecture)' == 'x86'" />
+ <_MsDiaSubDir Condition="'$(BuildArchitecture)' == 'x64'">amd64</_MsDiaSubDir>
+ </PropertyGroup>
+
<ItemGroup>
- <Content Include="$(VSInstallationPath)\DIA SDK\bin\amd64\msdia140.dll" CopyToOutputDirectory="PreserveNewest" />
+ <Content
+ Include="$([MSBuild]::NormalizePath('$(VSInstallationPath)\DIA SDK\bin','$(_MsDiaSubDir)','msdia140.dll'))"
+ CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</Target>