diff --git a/dir.props b/dir.props
index bf2c6b9379..edca00cb37 100644
--- a/dir.props
+++ b/dir.props
@@ -8,6 +8,7 @@
<_IsBootstrapping Condition="'$(BootstrapBuildToolsDir)' != ''">true
false
+ true
diff --git a/repos/coreclr.proj b/repos/coreclr.proj
index 936f7d8de7..9dad550ff3 100644
--- a/repos/coreclr.proj
+++ b/repos/coreclr.proj
@@ -4,6 +4,7 @@
$(Platform) $(Configuration) skiptests -PortableBuild=$(PortableBuild)
$(BuildArguments) msbuildonunsupportedplatform
+ $(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE
$(BuildArguments) skipnuget cross -skiprestore cmakeargs -DFEATURE_GDBJIT=TRUE
$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) --
$(ArmEnvironmentVariables) $(BuildCommand)