Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion utils/build-windows-toolchain.bat
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ set TMPDIR=%BuildRoot%\tmp
set NINJA_STATUS=[%%f/%%t][%%p][%%es]

:: Build the -Test argument, if any, by subtracting skipped tests
set TestArg=-Test lld,lldb,swift,dispatch,foundation,xctest,swift-format,sourcekit-lsp,
set TestArg=
for %%I in (%SKIP_TESTS%) do (call set TestArg=%%TestArg:%%I,=%%)
if "%TestArg:~-1%"=="," (set TestArg=%TestArg:~0,-1%) else (set TestArg= )

Expand All @@ -77,6 +77,8 @@ powershell.exe -ExecutionPolicy RemoteSigned -File %~dp0build.ps1 ^
-ImageRoot %BuildRoot% ^
%SkipPackagingArg% ^
%TestArg% ^
-AndroidSDKs aarch64 ^
-WindowsSDKs X64 ^
-Stage %PackageRoot% ^
-Summary || (exit /b 1)

Expand Down
4 changes: 4 additions & 0 deletions utils/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3233,6 +3233,10 @@ if (-not $SkipBuild) {
# Build platform: SDK, Redist and XCTest
Invoke-BuildStep Build-Runtime Android $Arch
Invoke-BuildStep Build-Dispatch Android $Arch

# FIXME
Get-ChildItem -Path "$(Get-TargetProjectBinaryCache $Arch Runtime)\lib\swift" -Filter "*.swiftinterface" -Recurse

Invoke-BuildStep Build-Foundation Android $Arch
Invoke-BuildStep Build-Sanitizers Android $Arch
Invoke-BuildStep Build-XCTest Android $Arch
Expand Down