Skip to content

Commit 73bc263

Browse files
committed
[utils/build-parser-lib] Avoid needing to have cmark repo present
1 parent 8fecc79 commit 73bc263

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

utils/build-parser-lib

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,15 @@ class Builder(object):
110110
cmake_args += ['-DCMAKE_INSTALL_PREFIX:PATH='+self.install_prefix]
111111
if self.version:
112112
cmake_args += ['-DSWIFT_LIBPARSER_VER:STRING='+self.version]
113-
cmake_args += ['-DLLVM_ENABLE_PROJECTS=clang;cmark;swift', '-DLLVM_EXTERNAL_PROJECTS=cmark;swift']
113+
cmake_args += ['-DLLVM_ENABLE_PROJECTS=clang;swift', '-DLLVM_EXTERNAL_PROJECTS=swift']
114114
cmake_args += ['-DSWIFT_BUILD_ONLY_SYNTAXPARSERLIB=TRUE']
115115
cmake_args += ['-DSWIFT_BUILD_PERF_TESTSUITE=NO', '-DSWIFT_INCLUDE_DOCS=NO']
116116
cmake_args += ['-DSWIFT_BUILD_REMOTE_MIRROR=FALSE', '-DSWIFT_BUILD_DYNAMIC_STDLIB=FALSE',
117117
'-DSWIFT_BUILD_STATIC_STDLIB=FALSE', '-DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=FALSE',
118118
'-DSWIFT_BUILD_STATIC_SDK_OVERLAY=FALSE']
119-
cmake_args += ['-DCMARK_TESTS=FALSE', '-DLLVM_INCLUDE_TESTS=FALSE', '-DCLANG_INCLUDE_TESTS=FALSE', '-DSWIFT_INCLUDE_TESTS=FALSE']
119+
# We are not using cmark but initialize the CMARK variables to something so that configure can succeed.
120+
cmake_args += ['-DCMARK_MAIN_INCLUDE_DIR='+os.path.join(SWIFT_SOURCE_ROOT, 'cmark'), '-DCMARK_BUILD_INCLUDE_DIR='+os.path.join(self.build_dir, 'cmark')]
121+
cmake_args += ['-DLLVM_INCLUDE_TESTS=FALSE', '-DCLANG_INCLUDE_TESTS=FALSE', '-DSWIFT_INCLUDE_TESTS=FALSE']
120122
cmake_args += [os.path.join(SWIFT_SOURCE_ROOT, 'llvm')]
121123
self.call(cmake_args)
122124

0 commit comments

Comments
 (0)