diff --git a/stdlib/public/RegexParser/CMakeLists.txt b/stdlib/public/RegexParser/CMakeLists.txt index 865852131e434..e1b774d649cb6 100644 --- a/stdlib/public/RegexParser/CMakeLists.txt +++ b/stdlib/public/RegexParser/CMakeLists.txt @@ -22,12 +22,10 @@ foreach(source ${_MATCHING_ENGINE_SOURCES}) endforeach() message(STATUS "Using Experimental String Processing library for _RegexParser (${SWIFT_PATH_TO_STRING_PROCESSING_SOURCE}).") -set(SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS_NO_RESILIENCE) -string(REGEX REPLACE "-enable-library-evolution" "" - SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS_NO_RESILIENCE - "${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}") - -add_swift_target_library(swift_RegexParser ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB +# The parser module can be fragile (does not use library evolution) because its +# only dependents are _StringProcessing and RegexBuilder and it's version-locked +# with those modules. +add_swift_target_library(swift_RegexParser ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB IS_FRAGILE "${MATCHING_ENGINE_SOURCES}" SWIFT_MODULE_DEPENDS_LINUX Glibc @@ -42,7 +40,6 @@ add_swift_target_library(swift_RegexParser ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I C_COMPILE_FLAGS -Dswift_RegexParser_EXPORTS SWIFT_COMPILE_FLAGS - ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS_NO_RESILIENCE} # Workaround until `_RegexParser` is imported as implementation-only # by `_StringProcessing`. -Xfrontend -disable-implicit-string-processing-module-import diff --git a/validation-test/ParseableInterface/verify_all_overlays.py b/validation-test/ParseableInterface/verify_all_overlays.py index b8686a42ee2a9..f36e4b3162bb6 100755 --- a/validation-test/ParseableInterface/verify_all_overlays.py +++ b/validation-test/ParseableInterface/verify_all_overlays.py @@ -50,9 +50,9 @@ ]: continue - # Cxx and CxxStdlib are built without library evolution and don't have a + # These modules are built without library evolution and don't have a # .swiftinterface file - if module_name in ["Cxx", "CxxStdlib"]: + if module_name in ["Cxx", "CxxStdlib", "_RegexParser"]: if not os.path.exists(interface_file): continue