Skip to content

Commit 5607a11

Browse files
committed
utils: tweak cmark wiring
Use the installed image rather than the build tree for wiring up CMark. This may be used across phases of the build, so it is better to use the staged image.
1 parent 0655578 commit 5607a11

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

utils/build.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ function Build-BuildTools($Arch) {
902902
SWIFT_INCLUDE_APINOTES = "NO";
903903
SWIFT_INCLUDE_DOCS = "NO";
904904
SWIFT_INCLUDE_TESTS = "NO";
905-
"cmark-gfm_DIR" = "$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13";
905+
"cmark-gfm_DIR" = "$($Arch.ToolchainInstallRoot)\usr\lib\cmake";
906906
}
907907
}
908908

@@ -1621,7 +1621,7 @@ function Build-Markdown($Arch) {
16211621
-Defines @{
16221622
BUILD_SHARED_LIBS = "NO";
16231623
ArgumentParser_DIR = "$BinaryCache\6\cmake\modules";
1624-
"cmark-gfm_DIR" = "$($Arch.BinaryCache)\cmark-gfm-0.29.0.gfm.13";
1624+
"cmark-gfm_DIR" = "$($Arch.ToolchainInstallRoot)\usr\lib\cmake";
16251625
}
16261626
}
16271627

@@ -1639,7 +1639,7 @@ function Build-Format($Arch) {
16391639
BUILD_SHARED_LIBS = "YES";
16401640
ArgumentParser_DIR = "$BinaryCache\6\cmake\modules";
16411641
SwiftSyntax_DIR = "$BinaryCache\1\cmake\modules";
1642-
"cmark-gfm_DIR" = "$($Arch.BinaryCache)\cmark-gfm-0.29.0.gfm.13";
1642+
"cmark-gfm_DIR" = "$($Arch.ToolchainInstallRoot)\usr\lib\cmake";
16431643
SwiftMarkdown_DIR = "$BinaryCache\13\cmake\modules";
16441644
}
16451645
}

0 commit comments

Comments
 (0)