@@ -3099,14 +3099,7 @@ function Install-SDK([Hashtable[]] $Platforms, [OS] $OS = $Platforms[0].OS, [str
30993099}
31003100
31013101function Build-SDK ([Hashtable ] $Platform ) {
3102- if ($IncludeDS2 ) {
3103- Invoke-BuildStep Build-DS2 $Platform
3104- }
3105-
31063102 # Third Party Dependencies
3107- Invoke-BuildStep Build-ZLib $Platform
3108- Invoke-BuildStep Build-XML2 $Platform
3109- Invoke-BuildStep Build-CURL $Platform
31103103 Invoke-BuildStep Build-LLVM $Platform
31113104
31123105 # Libraries
@@ -3941,6 +3934,16 @@ if (-not $SkipBuild) {
39413934 SwiftSyntax_DIR = (Get-ProjectCMakeModules $BuildPlatform Compilers);
39423935 }
39433936
3937+ foreach ($Build in $WindowsSDKBuilds ) {
3938+ if ($IncludeDS2 ) {
3939+ Invoke-BuildStep Build-DS2 $Build
3940+ }
3941+
3942+ Invoke-BuildStep Build-ZLib $Build
3943+ Invoke-BuildStep Build-XML2 $Build
3944+ Invoke-BuildStep Build-CURL $Build
3945+ }
3946+
39443947 foreach ($SDK in $WindowsSDKVersions ) {
39453948 switch ($SDK ) {
39463949 Windows {
@@ -3989,6 +3992,16 @@ if (-not $SkipBuild) {
39893992 Write-PlatformInfoPlist Windows
39903993
39913994 if ($Android ) {
3995+ foreach ($Build in $AndroidSDKBuilds ) {
3996+ if ($IncludeDS2 ) {
3997+ Invoke-BuildStep Build-DS2 $Build
3998+ }
3999+
4000+ Invoke-BuildStep Build-ZLib $Build
4001+ Invoke-BuildStep Build-XML2 $Build
4002+ Invoke-BuildStep Build-CURL $Build
4003+ }
4004+
39924005 foreach ($SDK in $AndroidSDKVersions ) {
39934006 switch ($SDK ) {
39944007 Android {
0 commit comments