Skip to content

Commit 36af875

Browse files
compnerdcompnerd
authored
Merge pull request #80289 from jeffdav/win-build-compilers-test-split
utils: Breakup Build-Compilers into Build- and Test- steps.
2 parents 880d7e5 + 4f8af6c commit 36af875

File tree

1 file changed

+137
-146
lines changed

1 file changed

+137
-146
lines changed

‎utils/build.ps1

Lines changed: 137 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -526,16 +526,16 @@ function Get-BisonExecutable {
526526
return Join-Path -Path $BinaryCache -ChildPath "win_flex_bison\win_bison.exe"
527527
}
528528

529-
function Get-PythonPath {
530-
return [IO.Path]::Combine("$BinaryCache\", "Python$($BuildPlatform.Architecture.CMakeName)-$PythonVersion")
529+
function Get-PythonPath([Hashtable] $Platform) {
530+
return [IO.Path]::Combine("$BinaryCache\", "Python$($Platform.Architecture.CMakeName)-$PythonVersion")
531531
}
532532

533533
function Get-PythonExecutable {
534-
return [IO.Path]::Combine((Get-PythonPath), "tools", "python.exe")
534+
return [IO.Path]::Combine((Get-PythonPath $BuildPlatform), "tools", "python.exe")
535535
}
536536

537537
function Get-PythonScriptsPath {
538-
return [IO.Path]::Combine((Get-PythonPath), "tools", "Scripts")
538+
return [IO.Path]::Combine((Get-PythonPath $BuildPlatform), "tools", "Scripts")
539539
}
540540

541541
function Get-InstallDir([Hashtable] $Platform) {
@@ -636,22 +636,12 @@ enum Project {
636636
StaticFoundation
637637
}
638638

639-
function Get-ProjectBinaryCache {
640-
[CmdletBinding(PositionalBinding = $false)]
641-
param
642-
(
643-
[Parameter(Position = 0, Mandatory = $true)]
644-
[Hashtable] $Platform,
645-
[Parameter(Position = 1, Mandatory = $true)]
646-
[Project] $Project
647-
)
648-
639+
function Get-ProjectBinaryCache([Hashtable] $Platform, [Project] $Project) {
649640
if ($Project -eq [Project]::Compilers) {
650641
if ($Platform -eq $HostPlatform) { return "$BinaryCache\5" }
651642
if ($Platform -eq $BuildPlatform) { return "$BinaryCache\1" }
652643
throw "Building Compilers for $($Platform.Triple) currently unsupported."
653644
}
654-
655645
return "$([IO.Path]::Combine("$BinaryCache\", $Platform.Triple, $Project.ToString()))"
656646
}
657647

@@ -1724,154 +1714,155 @@ function Load-LitTestOverrides($Filename) {
17241714
}
17251715
}
17261716

1727-
function Build-Compilers() {
1728-
[CmdletBinding(PositionalBinding = $false)]
1729-
param
1730-
(
1731-
[Parameter(Position = 0, Mandatory = $true)]
1732-
[hashtable]$Platform,
1733-
[switch]$TestClang = $false,
1734-
[switch]$TestLLD = $false,
1735-
[switch]$TestLLDB = $false,
1736-
[switch]$TestLLVM = $false,
1737-
[switch]$TestSwift = $false
1738-
)
1739-
1740-
Invoke-IsolatingEnvVars {
1741-
$BuildTools = Join-Path -Path (Get-ProjectBinaryCache $BuildPlatform BuildTools) -ChildPath bin
1742-
1743-
if ($TestClang -or $TestLLD -or $TestLLDB -or $TestLLVM -or $TestSwift) {
1744-
$env:Path = "$(Get-CMarkBinaryCache $Platform)\src;$(Get-ProjectBinaryCache $BuildPlatform Compilers)\tools\swift\libdispatch-windows-$($Platform.Architecture.LLVMName)-prefix\bin;$(Get-ProjectBinaryCache $BuildPlatform Compilers)\bin;$env:Path;$VSInstallRoot\DIA SDK\bin\$($HostPlatform.Architecture.VSName);$UnixToolsBinDir"
1745-
$Targets = @()
1746-
$TestingDefines = @{
1747-
SWIFT_BUILD_DYNAMIC_SDK_OVERLAY = "YES";
1748-
SWIFT_BUILD_DYNAMIC_STDLIB = "YES";
1749-
SWIFT_BUILD_REMOTE_MIRROR = "YES";
1750-
SWIFT_NATIVE_SWIFT_TOOLS_PATH = "";
1751-
}
1752-
1753-
if ($TestLLVM) { $Targets += @("check-llvm") }
1754-
if ($TestClang) { $Targets += @("check-clang") }
1755-
if ($TestLLD) { $Targets += @("check-lld") }
1756-
if ($TestSwift) { $Targets += @("check-swift", "SwiftCompilerPlugin") }
1757-
if ($TestLLDB) {
1758-
$Targets += @("check-lldb")
1759-
1760-
# Override test filter for known issues in downstream LLDB
1761-
Load-LitTestOverrides $PSScriptRoot/windows-llvm-lit-test-overrides.txt
1717+
function Get-CompilersDefines([Hashtable] $Platform, [switch] $Test) {
1718+
$BuildTools = [IO.Path]::Combine((Get-ProjectBinaryCache $BuildPlatform BuildTools), "bin")
1719+
$PythonRoot = [IO.Path]::Combine((Get-PythonPath $Platform), "tools")
1720+
$PythonLibName = "python{0}{1}" -f ([System.Version]$PythonVersion).Major, ([System.Version]$PythonVersion).Minor
17621721

1763-
# Transitive dependency of _lldb.pyd
1764-
$RuntimeBinaryCache = Get-ProjectBinaryCache $BuildPlatform Runtime
1765-
Copy-Item $RuntimeBinaryCache\bin\swiftCore.dll "$(Get-ProjectBinaryCache $BuildPlatform Compilers)\lib\site-packages\lldb"
1766-
1767-
# Runtime dependencies of repl_swift.exe
1768-
$SwiftRTSubdir = "lib\swift\windows"
1769-
Write-Host "Copying '$RuntimeBinaryCache\$SwiftRTSubdir\$($Platform.Architecture.LLVMName)\swiftrt.obj' to '$(Get-ProjectBinaryCache $BuildPlatform Compilers)\$SwiftRTSubdir'"
1770-
Copy-Item "$RuntimeBinaryCache\$SwiftRTSubdir\$($Platform.Architecture.LLVMName)\swiftrt.obj" "$(Get-ProjectBinaryCache $BuildPlatform Compilers)\$SwiftRTSubdir"
1771-
Write-Host "Copying '$RuntimeBinaryCache\bin\swiftCore.dll' to '$(Get-ProjectBinaryCache $BuildPlatform Compilers)\bin'"
1772-
Copy-Item "$RuntimeBinaryCache\bin\swiftCore.dll" "$(Get-ProjectBinaryCache $BuildPlatform Compilers)\bin"
1773-
1774-
$TestingDefines += @{
1775-
LLDB_INCLUDE_TESTS = "YES";
1776-
# Check for required Python modules in CMake
1777-
LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS = "YES";
1778-
# No watchpoint support on windows: https://github.com/llvm/llvm-project/issues/24820
1779-
LLDB_TEST_USER_ARGS = "--skip-category=watchpoint";
1780-
# gtest sharding breaks llvm-lit's --xfail and LIT_XFAIL inputs: https://github.com/llvm/llvm-project/issues/102264
1781-
LLVM_LIT_ARGS = "-v --no-gtest-sharding --show-xfail";
1782-
# LLDB Unit tests link against this library
1783-
LLVM_UNITTEST_LINK_FLAGS = "$(Get-SwiftSDK Windows)\usr\lib\swift\windows\$($Platform.Architecture.LLVMName)\swiftCore.lib";
1784-
}
1785-
}
1786-
} else {
1787-
$Targets = @("distribution", "install-distribution")
1788-
$TestingDefines = @{
1789-
SWIFT_BUILD_DYNAMIC_SDK_OVERLAY = "NO";
1790-
SWIFT_BUILD_DYNAMIC_STDLIB = "NO";
1791-
SWIFT_BUILD_REMOTE_MIRROR = "NO";
1792-
SWIFT_NATIVE_SWIFT_TOOLS_PATH = $BuildTools;
1793-
}
1722+
$TestDefines = if ($Test) {
1723+
@{
1724+
SWIFT_BUILD_DYNAMIC_SDK_OVERLAY = "YES";
1725+
SWIFT_BUILD_DYNAMIC_STDLIB = "YES";
1726+
SWIFT_BUILD_REMOTE_MIRROR = "YES";
1727+
SWIFT_NATIVE_SWIFT_TOOLS_PATH = "";
17941728
}
1729+
} else {
1730+
@{
1731+
SWIFT_BUILD_DYNAMIC_SDK_OVERLAY = "NO";
1732+
SWIFT_BUILD_DYNAMIC_STDLIB = "NO";
1733+
SWIFT_BUILD_REMOTE_MIRROR = "NO";
1734+
SWIFT_NATIVE_SWIFT_TOOLS_PATH = $BuildTools;
1735+
}
1736+
}
1737+
1738+
# If DebugInfo is enabled limit the number of parallel links to avoid OOM.
1739+
$DebugDefines = if ($DebugInfo) { @{ SWIFT_PARALLEL_LINK_JOBS = "4"; } } else { @{} }
1740+
1741+
# In the latest versions of VS, STL typically requires a newer version of
1742+
# Clang than released Swift toolchains include. Relax this requirement when
1743+
# bootstrapping with an older toolchain. Note developer builds are (currently)
1744+
# up-to-date.
1745+
$SwiftFlags = @();
1746+
if ([System.Version](Get-PinnedToolchainVersion) -ne [System.Version]"0.0.0") {
1747+
$SwiftFlags += @("-Xcc", "-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH");
1748+
}
1749+
1750+
return $TestDefines + $DebugDefines + @{
1751+
CLANG_TABLEGEN = (Join-Path -Path $BuildTools -ChildPath "clang-tblgen.exe");
1752+
CLANG_TIDY_CONFUSABLE_CHARS_GEN = (Join-Path -Path $BuildTools -ChildPath "clang-tidy-confusable-chars-gen.exe");
1753+
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
1754+
CMAKE_Swift_FLAGS = $SwiftFlags;
1755+
LibXml2_DIR = "$LibraryRoot\libxml2-2.11.5\usr\lib\Windows\$($Platform.Architecture.LLVMName)\cmake\libxml2-2.11.5";
1756+
LLDB_PYTHON_EXE_RELATIVE_PATH = "python.exe";
1757+
LLDB_PYTHON_EXT_SUFFIX = ".pyd";
1758+
LLDB_PYTHON_RELATIVE_PATH = "lib/site-packages";
1759+
LLDB_TABLEGEN = (Join-Path -Path $BuildTools -ChildPath "lldb-tblgen.exe");
1760+
LLDB_TEST_MAKE = "$BinaryCache\GnuWin32Make-4.4.1\bin\make.exe";
1761+
LLVM_CONFIG_PATH = (Join-Path -Path $BuildTools -ChildPath "llvm-config.exe");
1762+
LLVM_ENABLE_ASSERTIONS = $(if ($Variant -eq "Asserts") { "YES" } else { "NO" })
1763+
LLVM_EXTERNAL_SWIFT_SOURCE_DIR = "$SourceCache\swift";
1764+
LLVM_HOST_TRIPLE = $BuildPlatform.Triple;
1765+
LLVM_NATIVE_TOOL_DIR = $BuildTools;
1766+
LLVM_TABLEGEN = (Join-Path $BuildTools -ChildPath "llvm-tblgen.exe");
1767+
LLVM_USE_HOST_TOOLS = "NO";
1768+
Python3_EXECUTABLE = (Get-PythonExecutable);
1769+
Python3_INCLUDE_DIR = "$PythonRoot\include";
1770+
Python3_LIBRARY = "$PythonRoot\libs\$PythonLibName.lib";
1771+
Python3_ROOT_DIR = $PythonRoot;
1772+
SWIFT_BUILD_SWIFT_SYNTAX = "YES";
1773+
SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
1774+
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
1775+
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";
1776+
SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = "YES";
1777+
SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED = "YES";
1778+
SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION = "YES";
1779+
SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING = "YES";
1780+
SWIFT_ENABLE_SYNCHRONIZATION = "YES";
1781+
SWIFT_ENABLE_VOLATILE = "YES";
1782+
SWIFT_PATH_TO_LIBDISPATCH_SOURCE = "$SourceCache\swift-corelibs-libdispatch";
1783+
SWIFT_PATH_TO_STRING_PROCESSING_SOURCE = "$SourceCache\swift-experimental-string-processing";
1784+
SWIFT_PATH_TO_SWIFT_SDK = (Get-PinnedToolchainSDK);
1785+
SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE = "$SourceCache\swift-syntax";
1786+
SWIFT_STDLIB_ASSERTIONS = "NO";
1787+
SWIFTSYNTAX_ENABLE_ASSERTIONS = "NO";
1788+
"cmark-gfm_DIR" = "$($Platform.ToolchainInstallRoot)\usr\lib\cmake";
1789+
}
1790+
}
1791+
1792+
function Build-Compilers([Hashtable] $Platform) {
1793+
New-Item -ItemType SymbolicLink -Path "$BinaryCache\$($HostPlatform.Triple)\compilers" -Target "$BinaryCache\5" -ErrorAction Ignore
1794+
Build-CMakeProject `
1795+
-Src $SourceCache\llvm-project\llvm `
1796+
-Bin (Get-ProjectBinaryCache $Platform Compilers) `
1797+
-InstallTo "$($Platform.ToolchainInstallRoot)\usr" `
1798+
-Platform $Platform `
1799+
-UseMSVCCompilers C,CXX `
1800+
-UsePinnedCompilers Swift `
1801+
-BuildTargets @("install-distribution") `
1802+
-CacheScript $SourceCache\swift\cmake\caches\Windows-$($Platform.Architecture.LLVMName).cmake `
1803+
-Defines (Get-CompilersDefines $Platform)
17951804

1796-
$PythonRoot = "$BinaryCache\Python$($Platform.Architecture.CMakeName)-$PythonVersion\tools"
1797-
$PythonLibName = "python{0}{1}" -f ([System.Version]$PythonVersion).Major, ([System.Version]$PythonVersion).Minor
1805+
$Settings = @{
1806+
FallbackLibrarySearchPaths = @("usr/bin")
1807+
Identifier = "${ToolchainIdentifier}"
1808+
Version = "${ProductVersion}"
1809+
}
1810+
Write-PList -Settings $Settings -Path "$($Platform.ToolchainInstallRoot)\ToolchainInfo.plist"
1811+
}
17981812

1799-
# The STL in the latest versions of VS typically require a newer version of
1800-
# Clang than released Swift toolchains include. If bootstrapping with an
1801-
# older toolchain, we need to relax this requirement by defining
1802-
# _ALLOW_COMPILER_AND_STL_VERSION_MISMATCH. Developer builds are (currently)
1803-
# up-to-date.
1804-
$SwiftFlags = @();
1805-
if ([System.Version](Get-PinnedToolchainVersion) -ne [System.Version]"0.0.0") {
1806-
$SwiftFlags += @("-Xcc", "-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH");
1813+
function Test-Compilers([Hashtable] $Platform, [switch] $TestClang, [switch] $TestLLD, [switch] $TestLLDB, [switch] $TestLLVM, [switch] $TestSwift) {
1814+
Invoke-IsolatingEnvVars {
1815+
$env:Path = "$(Get-CMarkBinaryCache $Platform)\src;$(Get-ProjectBinaryCache $BuildPlatform Compilers)\tools\swift\libdispatch-windows-$($Platform.Architecture.LLVMName)-prefix\bin;$(Get-ProjectBinaryCache $BuildPlatform Compilers)\bin;$env:Path;$VSInstallRoot\DIA SDK\bin\$($HostPlatform.Architecture.VSName);$UnixToolsBinDir"
1816+
$TestingDefines = Get-CompilersDefines $Platform -Test
1817+
if ($TestLLVM) { $Targets += @("check-llvm") }
1818+
if ($TestClang) { $Targets += @("check-clang") }
1819+
if ($TestLLD) { $Targets += @("check-lld") }
1820+
if ($TestSwift) { $Targets += @("check-swift", "SwiftCompilerPlugin") }
1821+
if ($TestLLDB) {
1822+
$Targets += @("check-lldb")
1823+
1824+
# Override test filter for known issues in downstream LLDB
1825+
Load-LitTestOverrides $PSScriptRoot/windows-llvm-lit-test-overrides.txt
1826+
1827+
# Transitive dependency of _lldb.pyd
1828+
$RuntimeBinaryCache = Get-ProjectBinaryCache $BuildPlatform Runtime
1829+
Copy-Item $RuntimeBinaryCache\bin\swiftCore.dll "$(Get-ProjectBinaryCache $BuildPlatform Compilers)\lib\site-packages\lldb"
1830+
1831+
# Runtime dependencies of repl_swift.exe
1832+
$SwiftRTSubdir = "lib\swift\windows"
1833+
Write-Host "Copying '$RuntimeBinaryCache\$SwiftRTSubdir\$($Platform.Architecture.LLVMName)\swiftrt.obj' to '$(Get-ProjectBinaryCache $BuildPlatform Compilers)\$SwiftRTSubdir'"
1834+
Copy-Item "$RuntimeBinaryCache\$SwiftRTSubdir\$($Platform.Architecture.LLVMName)\swiftrt.obj" "$(Get-ProjectBinaryCache $BuildPlatform Compilers)\$SwiftRTSubdir"
1835+
Write-Host "Copying '$RuntimeBinaryCache\bin\swiftCore.dll' to '$(Get-ProjectBinaryCache $BuildPlatform Compilers)\bin'"
1836+
Copy-Item "$RuntimeBinaryCache\bin\swiftCore.dll" "$(Get-ProjectBinaryCache $BuildPlatform Compilers)\bin"
1837+
1838+
$TestingDefines += @{
1839+
LLDB_INCLUDE_TESTS = "YES";
1840+
# Check for required Python modules in CMake
1841+
LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS = "YES";
1842+
# No watchpoint support on windows: https://github.com/llvm/llvm-project/issues/24820
1843+
LLDB_TEST_USER_ARGS = "--skip-category=watchpoint";
1844+
# gtest sharding breaks llvm-lit's --xfail and LIT_XFAIL inputs: https://github.com/llvm/llvm-project/issues/102264
1845+
LLVM_LIT_ARGS = "-v --no-gtest-sharding --show-xfail";
1846+
# LLDB Unit tests link against this library
1847+
LLVM_UNITTEST_LINK_FLAGS = "$(Get-SwiftSDK Windows)\usr\lib\swift\windows\$($Platform.Architecture.LLVMName)\swiftCore.lib";
1848+
}
18071849
}
18081850

1809-
# Limit the number of parallel links to avoid OOM when debug info is enabled
1810-
$DebugOptions = @{}
1811-
if ($DebugInfo) {
1812-
$DebugOptions = @{ SWIFT_PARALLEL_LINK_JOBS = "4"; }
1851+
if (-not $Targets) {
1852+
Write-Warning "Test-Compilers invoked without specifying test target(s)."
18131853
}
18141854

1815-
New-Item -ItemType SymbolicLink -Path "$BinaryCache\$($HostPlatform.Triple)\compilers" -Target "$BinaryCache\5" -ErrorAction Ignore
18161855
Build-CMakeProject `
18171856
-Src $SourceCache\llvm-project\llvm `
18181857
-Bin $(Get-ProjectBinaryCache $Platform Compilers) `
18191858
-InstallTo "$($Platform.ToolchainInstallRoot)\usr" `
18201859
-Platform $Platform `
1821-
-AddAndroidCMakeEnv:$Android `
18221860
-UseMSVCCompilers C,CXX `
18231861
-UsePinnedCompilers Swift `
18241862
-BuildTargets $Targets `
18251863
-CacheScript $SourceCache\swift\cmake\caches\Windows-$($Platform.Architecture.LLVMName).cmake `
1826-
-Defines ($TestingDefines + @{
1827-
CLANG_TABLEGEN = (Join-Path -Path $BuildTools -ChildPath "clang-tblgen.exe");
1828-
CLANG_TIDY_CONFUSABLE_CHARS_GEN = (Join-Path -Path $BuildTools -ChildPath "clang-tidy-confusable-chars-gen.exe");
1829-
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
1830-
CMAKE_Swift_FLAGS = $SwiftFlags;
1831-
LibXml2_DIR = "$LibraryRoot\libxml2-2.11.5\usr\lib\Windows\$($Platform.Architecture.LLVMName)\cmake\libxml2-2.11.5";
1832-
LLDB_PYTHON_EXE_RELATIVE_PATH = "python.exe";
1833-
LLDB_PYTHON_EXT_SUFFIX = ".pyd";
1834-
LLDB_PYTHON_RELATIVE_PATH = "lib/site-packages";
1835-
LLDB_TABLEGEN = (Join-Path -Path $BuildTools -ChildPath "lldb-tblgen.exe");
1836-
LLDB_TEST_MAKE = "$BinaryCache\GnuWin32Make-4.4.1\bin\make.exe";
1837-
LLVM_CONFIG_PATH = (Join-Path -Path $BuildTools -ChildPath "llvm-config.exe");
1838-
LLVM_ENABLE_ASSERTIONS = $(if ($Variant -eq "Asserts") { "YES" } else { "NO" })
1839-
LLVM_EXTERNAL_SWIFT_SOURCE_DIR = "$SourceCache\swift";
1840-
LLVM_HOST_TRIPLE = $BuildPlatform.Triple;
1841-
LLVM_NATIVE_TOOL_DIR = $BuildTools;
1842-
LLVM_TABLEGEN = (Join-Path $BuildTools -ChildPath "llvm-tblgen.exe");
1843-
LLVM_USE_HOST_TOOLS = "NO";
1844-
Python3_EXECUTABLE = (Get-PythonExecutable);
1845-
Python3_INCLUDE_DIR = "$PythonRoot\include";
1846-
Python3_LIBRARY = "$PythonRoot\libs\$PythonLibName.lib";
1847-
Python3_ROOT_DIR = $PythonRoot;
1848-
SWIFT_BUILD_SWIFT_SYNTAX = "YES";
1849-
SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
1850-
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
1851-
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";
1852-
SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = "YES";
1853-
SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED = "YES";
1854-
SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION = "YES";
1855-
SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING = "YES";
1856-
SWIFT_ENABLE_SYNCHRONIZATION = "YES";
1857-
SWIFT_ENABLE_VOLATILE = "YES";
1858-
SWIFT_PATH_TO_LIBDISPATCH_SOURCE = "$SourceCache\swift-corelibs-libdispatch";
1859-
SWIFT_PATH_TO_STRING_PROCESSING_SOURCE = "$SourceCache\swift-experimental-string-processing";
1860-
SWIFT_PATH_TO_SWIFT_SDK = (Get-PinnedToolchainSDK);
1861-
SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE = "$SourceCache\swift-syntax";
1862-
SWIFT_STDLIB_ASSERTIONS = "NO";
1863-
SWIFTSYNTAX_ENABLE_ASSERTIONS = "NO";
1864-
"cmark-gfm_DIR" = "$($Platform.ToolchainInstallRoot)\usr\lib\cmake";
1865-
} + $DebugOptions)
1864+
-Defines $TestingDefines
18661865
}
1867-
1868-
$Settings = @{
1869-
FallbackLibrarySearchPaths = @("usr/bin")
1870-
Identifier = "${ToolchainIdentifier}"
1871-
Version = "${ProductVersion}"
1872-
}
1873-
1874-
Write-PList -Settings $Settings -Path "$($Platform.ToolchainInstallRoot)\ToolchainInfo.plist"
18751866
}
18761867

18771868
# Reference: https://github.com/microsoft/mimalloc/tree/dev/bin#minject
@@ -3301,7 +3292,7 @@ if (-not $IsCrossCompiling) {
33013292
"-TestLLVM" = $Test -contains "llvm";
33023293
"-TestSwift" = $Test -contains "swift";
33033294
}
3304-
Invoke-BuildStep Build-Compilers $HostPlatform $Tests
3295+
Invoke-BuildStep Test-Compilers $HostPlatform $Tests
33053296
}
33063297

33073298
# FIXME(jeffdav): Invoke-BuildStep needs a platform dictionary, even though the Test-

0 commit comments

Comments
 (0)