Skip to content

Commit d14edcc

Browse files
author
Max Charlamb
committed
platform specific nativeaot linking
1 parent cbbdeeb commit d14edcc

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/native/managed/cdacreader/src/cdacreader.csproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,17 @@
3838
<DirectPInvoke Include="unwinder_cdac_amd64" />
3939
<DirectPInvoke Include="unwinder_cdac_arm64" />
4040

41+
<!-- unwinder_cdac_base is supported on all platforms -->
4142
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_base.lib" Condition="'$(TargetsWindows)' == 'true'"/>
4243
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_base.a" Condition="'$(TargetsWindows)' != 'true'" />
43-
44+
45+
<!-- amd64 and arm64 are supported on windows x64, or on their native platform -->
4446
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(TargetArchitecture)' == 'x64'" />
45-
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(TargetArchitecture)' == 'x64'" />
47+
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')" />
4648

47-
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.a" Condition="'$(TargetsWindows)' != 'true'" />
48-
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.a" Condition="'$(TargetsWindows)' != 'true'" />
49+
<!-- non-windows, load only the platform native unwinders -->
50+
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.a" Condition="'$(TargetsWindows)' != 'true' and '$(TargetArchitecture)' == 'x64'" />
51+
<NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.a" Condition="'$(TargetsWindows)' != 'true' and '$(TargetArchitecture)' == 'arm64'" />
4952
</ItemGroup>
5053

5154
<ItemGroup>

0 commit comments

Comments
 (0)