@@ -1508,8 +1508,6 @@ function Get-CMarkBinaryCache($Arch) {
1508
1508
}
1509
1509
1510
1510
function Build-CMark ($Arch ) {
1511
- $ArchName = $Arch.LLVMName
1512
-
1513
1511
Build-CMakeProject `
1514
1512
- Src $SourceCache \cmark `
1515
1513
- Bin (Get-CMarkBinaryCache $Arch ) `
@@ -1898,8 +1896,6 @@ function Build-XML2([Platform]$Platform, $Arch) {
1898
1896
}
1899
1897
1900
1898
function Build-RegsGen2 ($Arch ) {
1901
- $ArchName = $Arch.LLVMName
1902
-
1903
1899
Build-CMakeProject `
1904
1900
- Src $SourceCache \ds2\Tools\RegsGen2 `
1905
1901
- Bin " $ ( Get-BuildProjectBinaryCache RegsGen2) " `
@@ -2111,26 +2107,20 @@ function Build-ExperimentalRuntime {
2111
2107
Isolate- EnvVars {
2112
2108
$env: Path = " $ ( Get-CMarkBinaryCache $Arch ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
2113
2109
2114
- $CompilersBinaryCache = if ($IsCrossCompiling ) {
2115
- Get-BuildProjectBinaryCache Compilers
2116
- } else {
2117
- Get-HostProjectBinaryCache Compilers
2118
- }
2119
-
2120
- Build-CMakeProject `
2121
- - Src $SourceCache \swift\Runtimes\Core `
2122
- - Bin (Get-TargetProjectBinaryCache $Arch ExperimentalRuntime) `
2123
- - InstallTo " $ ( $Arch.ExperimentalSDKInstallRoot ) \usr" `
2124
- - Arch $Arch `
2125
- - Platform $Platform `
2126
- - UseBuiltCompilers C, CXX, Swift `
2127
- - UseGNUDriver `
2128
- - Defines @ {
2129
- BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2130
- CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2131
- CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2132
- dispatch_DIR = " $ ( Get-TargetProjectBinaryCache $Arch Dispatch) \cmake\modules" ;
2133
- }
2110
+ Build-CMakeProject `
2111
+ - Src $SourceCache \swift\Runtimes\Core `
2112
+ - Bin (Get-TargetProjectBinaryCache $Arch ExperimentalRuntime) `
2113
+ - InstallTo " $ ( $Arch.ExperimentalSDKInstallRoot ) \usr" `
2114
+ - Arch $Arch `
2115
+ - Platform $Platform `
2116
+ - UseBuiltCompilers C, CXX, Swift `
2117
+ - UseGNUDriver `
2118
+ - Defines @ {
2119
+ BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2120
+ CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2121
+ CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2122
+ dispatch_DIR = " $ ( Get-TargetProjectBinaryCache $Arch Dispatch) \cmake\modules" ;
2123
+ }
2134
2124
}
2135
2125
}
2136
2126
0 commit comments