@@ -664,15 +664,15 @@ function Get-TargetInfo([Hashtable] $Platform) {
664
664
# Cache the result of "swiftc -print-target-info" as $Platform.Cache.TargetInfo
665
665
$CacheKey = " TargetInfo"
666
666
if (-not $Platform.Cache.ContainsKey ($CacheKey )) {
667
- Invoke-IsolatingEnvVars {
667
+ [ void ]( Invoke-IsolatingEnvVars {
668
668
$env: Path = " $ ( Get-PinnedToolchainRuntime ) ;$ ( Get-PinnedToolchainToolsDir ) ;${env: Path} "
669
669
$TargetInfo = & swiftc - target $Platform.Triple - print- target- info
670
670
if ($LastExitCode -ne 0 ) {
671
671
throw " Unable to print target info for '$ ( $Platform.Triple ) '"
672
672
}
673
673
$TargetInfo = $TargetInfo | ConvertFrom-JSON
674
674
$Platform.Cache [$CacheKey ] = $TargetInfo.target
675
- }
675
+ })
676
676
}
677
677
return $Platform.Cache [$CacheKey ]
678
678
}
@@ -1353,7 +1353,7 @@ function Build-CMakeProject {
1353
1353
}
1354
1354
if ($UseBuiltCompilers.Contains (" Swift" )) {
1355
1355
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform )
1356
- $RuntimeBinaryCache = Get-ProjectBinaryCache $BuildPlatform Runtime
1356
+ $RuntimeBinaryCache = Get-ProjectBinaryCache $Platform Runtime
1357
1357
$SwiftResourceDir = " ${RuntimeBinaryCache} \lib\swift"
1358
1358
1359
1359
switch ($Platform.OS ) {
@@ -1958,8 +1958,8 @@ function Build-LLVM([Hashtable] $Platform) {
1958
1958
function Build-Sanitizers ([Hashtable ] $Platform ) {
1959
1959
$LLVMTargetCache = $ (Get-ProjectBinaryCache $Platform LLVM)
1960
1960
$LITVersionStr = $ (Invoke-Program $ (Get-PythonExecutable ) " $LLVMTargetCache \bin\llvm-lit.py" -- version)
1961
- if (-not ($LITVersionStr -match " lit (\d+)\.\d+\.\d+.*" )) {
1962
- throw " Unexpected version string output from llvm-lit.py"
1961
+ if (-not $ToBatch -and -not ($LITVersionStr -match " lit (\d+)\.\d+\.\d+.*" )) {
1962
+ throw " Unexpected version string ' $LITVersionStr ' output from llvm-lit.py"
1963
1963
}
1964
1964
$LLVMVersionMajor = $Matches.1
1965
1965
$InstallTo = " $ ( $HostPlatform.ToolchainInstallRoot ) \usr\lib\clang\$LLVMVersionMajor "
0 commit comments