@@ -1182,7 +1182,7 @@ function Build-CMakeProject {
11821182 }
11831183
11841184 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} "
11861186 } elseif ($UsePinnedCompilers.Contains (" Swift" )) {
11871187 $env: Path = " $ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
11881188 }
@@ -1347,15 +1347,16 @@ function Build-WiXProject() {
13471347 Invoke-Program $msbuild @MSBuildArgs
13481348}
13491349
1350- function Get-CMark-BinaryCache ($Arch ) {
1350+ function Get-CMarkBinaryCache ($Arch ) {
13511351 return " $ ( $Arch.BinaryCache ) \cmark-gfm-0.29.0.gfm.13"
13521352}
1353+
13531354function Build-CMark ($Arch ) {
13541355 $ArchName = $Arch.LLVMName
13551356
13561357 Build-CMakeProject `
13571358 - Src $SourceCache \cmark `
1358- - Bin (Get-CMark - BinaryCache( $Arch ) ) `
1359+ - Bin (Get-CMarkBinaryCache $Arch ) `
13591360 - InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
13601361 - Arch $Arch `
13611362 - Defines @ {
@@ -1424,7 +1425,7 @@ function Build-Compilers() {
14241425 $BuildTools = Join-Path - Path (Get-BuildProjectBinaryCache BuildTools) - ChildPath bin
14251426
14261427 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 "
14281429 $Targets = @ ()
14291430 $TestingDefines = @ {
14301431 SWIFT_BUILD_DYNAMIC_SDK_OVERLAY = " YES" ;
@@ -1769,7 +1770,7 @@ function Build-Runtime([Platform]$Platform, $Arch) {
17691770
17701771
17711772 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} "
17731774
17741775 $CompilersBinaryCache = if ($IsCrossCompiling ) {
17751776 Get-BuildProjectBinaryCache Compilers
@@ -2410,8 +2411,8 @@ function Test-Format {
24102411 " -Xswiftc" , " -I$ ( $SourceCache ) \cmark\src\include" ,
24112412 " -Xswiftc" , " -I$ ( $SourceCache ) \cmark\extensions\include" ,
24122413 " -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" ,
24152416 # swift-markdown
24162417 " -Xlinker" , " $ ( Get-HostProjectBinaryCache Markdown) \lib\CAtomic.lib" ,
24172418 " -Xswiftc" , " -I$ ( $SourceCache ) \swift-markdown\Sources\CAtomic\include" ,
@@ -2485,8 +2486,8 @@ function Test-SourceKitLSP {
24852486 " -Xswiftc" , " -I$ ( $SourceCache ) \cmark\src\include" ,
24862487 " -Xswiftc" , " -I$ ( $SourceCache ) \cmark\extensions\include" ,
24872488 " -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" ,
24902491 # swift-system
24912492 " -Xswiftc" , " -I$ ( $SourceCache ) \swift-system\Sources\CSystem\include" ,
24922493 " -Xswiftc" , " -I$ ( Get-HostProjectBinaryCache System) \swift" ,
0 commit comments