Skip to content

Commit 2421c92

Browse files
authored
Merge pull request swiftlang#69971 from rintaro/cmake-regex-without-astgen
[CMake] Disable Regex literal when Swift parser integration is disabled
2 parents 395a5e8 + ee982fd commit 2421c92

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,6 @@ option(SWIFT_BUILD_PERF_TESTSUITE
270270
"Create in-tree targets for building swift performance benchmarks."
271271
FALSE)
272272

273-
option(SWIFT_BUILD_REGEX_PARSER_IN_COMPILER
274-
"Build the Swift regex parser as part of the compiler."
275-
TRUE)
276-
277273
option(SWIFT_INCLUDE_TESTS "Create targets for building/running tests." TRUE)
278274

279275
option(SWIFT_INCLUDE_TEST_BINARIES
@@ -721,6 +717,14 @@ option(SWIFT_BUILD_SWIFT_SYNTAX
721717
"Enable building swift syntax"
722718
FALSE)
723719

720+
option(SWIFT_BUILD_REGEX_PARSER_IN_COMPILER
721+
"Build the Swift regex parser as part of the compiler."
722+
TRUE)
723+
if(SWIFT_BUILD_REGEX_PARSER_IN_COMPILER AND NOT SWIFT_BUILD_SWIFT_SYNTAX)
724+
message(WARNING "Force setting SWIFT_BUILD_REGEX_PARSER_IN_COMPILER=OFF because Swift parser integration is disabled")
725+
set(SWIFT_BUILD_REGEX_PARSER_IN_COMPILER OFF)
726+
endif()
727+
724728
set(SWIFT_BUILD_HOST_DISPATCH FALSE)
725729
if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
726730
# Only build libdispatch for the host if the host tools are being built and

0 commit comments

Comments
 (0)