Skip to content

Commit 5eb47e5

Browse files
committed
try fix src/Sentry/Platforms/Native/Sentry.Native.targets
1 parent f6254d2 commit 5eb47e5

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/Sentry/Platforms/Native/Sentry.Native.targets

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
<SentryNativeOutputDirectory-linux-musl-x64>$(SentryNativeOutputDirectory)$(NativeLibRelativePath-linux-musl-x64)\</SentryNativeOutputDirectory-linux-musl-x64>
1616
<NativeLibRelativePath-osx>osx</NativeLibRelativePath-osx>
1717
<SentryNativeOutputDirectory-osx>$(SentryNativeOutputDirectory)$(NativeLibRelativePath-osx)\</SentryNativeOutputDirectory-osx>
18+
<IsLinuxX64 Condition="$([MSBuild]::IsOsPlatform('Linux')) and $([System.IO.Directory]::GetFiles('/lib*', 'ld-linux-x86-64.so*').Length) &gt; 0">true</IsLinuxX64>
19+
<IsLinuxMuslX64 Condition="$([MSBuild]::IsOsPlatform('Linux')) and $([System.IO.Directory]::GetFiles('/lib', 'ld-musl-x86_64.so*').Length) &gt; 0">true</IsLinuxMuslX64>
1820
<SentryNativeBuildOutputs Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(SentryNativeOutputDirectory-win-x64)$(SentryNativeLibraryName).lib</SentryNativeBuildOutputs>
19-
<SentryNativeBuildOutputs Condition="'$(RuntimeIdentifier)' == 'linux-x64'">$(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
20-
<SentryNativeBuildOutputs Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64'">$(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
21+
<SentryNativeBuildOutputs Condition="'$(IsLinuxX64)' == 'true'">$(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
22+
<SentryNativeBuildOutputs Condition="'$(IsLinuxMuslX64)' == 'true'">$(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
2123
<SentryNativeBuildOutputs Condition="$([MSBuild]::IsOsPlatform('OSX'))">$(SentryNativeOutputDirectory-osx)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
2224
</PropertyGroup>
2325

@@ -35,14 +37,14 @@
3537
</None>
3638
</ItemGroup>
3739

38-
<ItemGroup Condition="'$(CI_PUBLISHING_BUILD)' == 'true' or '$(RuntimeIdentifier)' == 'linux-x64'">
40+
<ItemGroup Condition="'$(CI_PUBLISHING_BUILD)' == 'true' or '$(IsLinuxX64)' == 'true'">
3941
<None Include="$(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a">
4042
<Pack>true</Pack>
4143
<PackagePath>\sentry-native\$(NativeLibRelativePath-linux-x64)</PackagePath>
4244
</None>
4345
</ItemGroup>
4446

45-
<ItemGroup Condition="'$(CI_PUBLISHING_BUILD)' == 'true' or '$(RuntimeIdentifier)' == 'linux-musl-x64'">
47+
<ItemGroup Condition="'$(CI_PUBLISHING_BUILD)' == 'true' or '$(IsLinuxMuslX64)' == 'true'">
4648
<None Include="$(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a">
4749
<Pack>true</Pack>
4850
<PackagePath>\sentry-native\$(NativeLibRelativePath-linux-musl-x64)</PackagePath>

0 commit comments

Comments
 (0)