Skip to content

Commit 8d6ecb7

Browse files
authored
Merge pull request #391 from omajid/system-library-libunwind
Introduce a UseSystemLibraries option to use the system libunwind
2 parents 5f396d4 + 614fa98 commit 8d6ecb7

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

dir.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<_IsBootstrapping Condition="'$(BootstrapBuildToolsDir)' != ''">true</_IsBootstrapping>
99

1010
<PortableBuild Condition="'$(PortableBuild)' == ''">false</PortableBuild>
11+
<UseSystemLibraries Condition="'$(UseSystemLibraries)' == ''">true</UseSystemLibraries>
1112
</PropertyGroup>
1213

1314
<PropertyGroup>

repos/coreclr.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<BuildArguments>$(Platform) $(Configuration) skiptests -PortableBuild=$(PortableBuild)</BuildArguments>
66
<BuildArguments Condition="'$(OS)' != 'Windows_NT'">$(BuildArguments) msbuildonunsupportedplatform</BuildArguments>
7+
<BuildArguments Condition="'$(UseSystemLibraries)' == 'true'">$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</BuildArguments>
78
<BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) skipnuget cross -skiprestore cmakeargs -DFEATURE_GDBJIT=TRUE</BuildArguments>
89
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) --</BuildCommand>
910
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

0 commit comments

Comments
 (0)