@@ -1182,7 +1182,7 @@ function Build-CMakeProject {
1182
1182
}
1183
1183
1184
1184
if ($UseBuiltCompilers.Contains (" Swift" )) {
1185
- $env: Path = " $ ( $BuildArch.SDKInstallRoot ) \usr\bin;$ ( Get-CMark - BinaryCache( $Arch ) ) \src;$ ( $BuildArch.ToolchainInstallRoot ) \usr\bin;${env: Path} "
1185
+ $env: Path = " $ ( $BuildArch.SDKInstallRoot ) \usr\bin;$ ( Get-CMarkBinaryCache $Arch ) \src;$ ( $BuildArch.ToolchainInstallRoot ) \usr\bin;${env: Path} "
1186
1186
} elseif ($UsePinnedCompilers.Contains (" Swift" )) {
1187
1187
$env: Path = " $ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1188
1188
}
@@ -1347,15 +1347,16 @@ function Build-WiXProject() {
1347
1347
Invoke-Program $msbuild @MSBuildArgs
1348
1348
}
1349
1349
1350
- function Get-CMark-BinaryCache ($Arch ) {
1350
+ function Get-CMarkBinaryCache ($Arch ) {
1351
1351
return " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13"
1352
1352
}
1353
+
1353
1354
function Build-CMark ($Arch ) {
1354
1355
$ArchName = $Arch.LLVMName
1355
1356
1356
1357
Build-CMakeProject `
1357
1358
- Src $SourceCache \cmark `
1358
- - Bin (Get-CMark - BinaryCache( $Arch ) ) `
1359
+ - Bin (Get-CMarkBinaryCache $Arch ) `
1359
1360
- InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1360
1361
- Arch $Arch `
1361
1362
- Defines @ {
@@ -1424,7 +1425,7 @@ function Build-Compilers() {
1424
1425
$BuildTools = Join-Path - Path (Get-BuildProjectBinaryCache BuildTools) - ChildPath bin
1425
1426
1426
1427
if ($TestClang -or $TestLLD -or $TestLLDB -or $TestLLVM -or $TestSwift ) {
1427
- $env: Path = " $ ( Get-CMark - BinaryCache( $Arch ) ) \src;$CompilersBinaryCache \tools\swift\libdispatch-windows-$ ( $Arch.LLVMName ) -prefix\bin;$CompilersBinaryCache \bin;$env: Path ;$VSInstallRoot \DIA SDK\bin\$ ( $HostArch.VSName ) ;$UnixToolsBinDir "
1428
+ $env: Path = " $ ( Get-CMarkBinaryCache $Arch ) \src;$CompilersBinaryCache \tools\swift\libdispatch-windows-$ ( $Arch.LLVMName ) -prefix\bin;$CompilersBinaryCache \bin;$env: Path ;$VSInstallRoot \DIA SDK\bin\$ ( $HostArch.VSName ) ;$UnixToolsBinDir "
1428
1429
$Targets = @ ()
1429
1430
$TestingDefines = @ {
1430
1431
SWIFT_BUILD_DYNAMIC_SDK_OVERLAY = " YES" ;
@@ -1769,7 +1770,7 @@ function Build-Runtime([Platform]$Platform, $Arch) {
1769
1770
1770
1771
1771
1772
Isolate- EnvVars {
1772
- $env: Path = " $ ( Get-CMark - BinaryCache( $Arch ) ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1773
+ $env: Path = " $ ( Get-CMarkBinaryCache $Arch ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1773
1774
1774
1775
$CompilersBinaryCache = if ($IsCrossCompiling ) {
1775
1776
Get-BuildProjectBinaryCache Compilers
@@ -2410,8 +2411,8 @@ function Test-Format {
2410
2411
" -Xswiftc" , " -I$ ( $SourceCache ) \cmark\src\include" ,
2411
2412
" -Xswiftc" , " -I$ ( $SourceCache ) \cmark\extensions\include" ,
2412
2413
" -Xlinker" , " -I$ ( $SourceCache ) \cmark\extensions\include" ,
2413
- " -Xlinker" , " $ ( Get-CMark - BinaryCache( $HostArch ) ) \src\cmark-gfm.lib" ,
2414
- " -Xlinker" , " $ ( Get-CMark - BinaryCache( $HostArch ) ) \extensions\cmark-gfm-extensions.lib" ,
2414
+ " -Xlinker" , " $ ( Get-CMarkBinaryCache $HostArch ) \src\cmark-gfm.lib" ,
2415
+ " -Xlinker" , " $ ( Get-CMarkBinaryCache $HostArch ) \extensions\cmark-gfm-extensions.lib" ,
2415
2416
# swift-markdown
2416
2417
" -Xlinker" , " $ ( Get-HostProjectBinaryCache Markdown) \lib\CAtomic.lib" ,
2417
2418
" -Xswiftc" , " -I$ ( $SourceCache ) \swift-markdown\Sources\CAtomic\include" ,
@@ -2485,8 +2486,8 @@ function Test-SourceKitLSP {
2485
2486
" -Xswiftc" , " -I$ ( $SourceCache ) \cmark\src\include" ,
2486
2487
" -Xswiftc" , " -I$ ( $SourceCache ) \cmark\extensions\include" ,
2487
2488
" -Xlinker" , " -I$ ( $SourceCache ) \cmark\extensions\include" ,
2488
- " -Xlinker" , " $ ( Get-CMark - BinaryCache( $HostArch ) ) \src\cmark-gfm.lib" ,
2489
- " -Xlinker" , " $ ( Get-CMark - BinaryCache( $HostArch ) ) \extensions\cmark-gfm-extensions.lib" ,
2489
+ " -Xlinker" , " $ ( Get-CMarkBinaryCache $HostArch ) \src\cmark-gfm.lib" ,
2490
+ " -Xlinker" , " $ ( Get-CMarkBinaryCache $HostArch ) \extensions\cmark-gfm-extensions.lib" ,
2490
2491
# swift-system
2491
2492
" -Xswiftc" , " -I$ ( $SourceCache ) \swift-system\Sources\CSystem\include" ,
2492
2493
" -Xswiftc" , " -I$ ( Get-HostProjectBinaryCache System) \swift" ,
0 commit comments