Skip to content

Commit 949a0ae

Browse files
authored
Merge pull request #77819 from etcwilde/ewilde/stdlib-rebuild-enable-unicode-data
[CMake] Enable unicode data support
2 parents f4acced + f273a2e commit 949a0ae

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ defaulted_option(SwiftCore_ENABLE_STATIC_PRINT "Disable full print")
8989
defaulted_option(SwiftCore_ENABLE_UNICODE_DATA "Embed Unicode info in Swift Core")
9090
defaulted_option(SwiftCore_ENABLE_COMPACT_ABSOLUTE_FUNCTION_POINTERS "Resolve absolute function pointer as identity")
9191
defaulted_option(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT "Add symbols for runtime backdeployment")
92+
option(SwiftCore_ENABLE_UNICODE_DATA "Include unicode data in Swift runtimes" ON)
9293

9394
defaulted_option(SwiftCore_ENABLE_BACKTRACING "Enable backtracing runtime support")
9495
defaulted_set(SwiftCore_BACKTRACER_PATH STRING "Set a fixed path to the Swift backtracer")

Runtimes/Core/stubs/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ if(SwiftCore_ENABLE_OBJC_INTEROP)
2626
endif()
2727

2828

29-
target_compile_definitions(swiftStdlibStubs PRIVATE swiftCore_EXPORTS)
29+
target_compile_definitions(swiftStdlibStubs PRIVATE
30+
swiftCore_EXPORTS
31+
$<$<BOOL:${SwiftCore_ENABLE_UNICODE_DATA}>:-DSWIFT_STDLIB_ENABLE_UNICODE_DATA>)
3032
target_link_libraries(swiftStdlibStubs PRIVATE swiftShims)
3133
target_include_directories(swiftStdlibStubs PRIVATE
3234
"${PROJECT_BINARY_DIR}/include"

0 commit comments

Comments
 (0)