Skip to content

Commit 979599d

Browse files
authored
Merge pull request #78483 from etcwilde/ewilde/stdlib-rebuild-has-locale
CMake: SwiftCore: Add Locale macro
2 parents 8f7e71a + 37223c8 commit 979599d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ set(SwiftCore_VENDOR_MODULE_DIR "${SwiftCore_CMAKE_MODULES_DIR}/vendor"
6262

6363
include(GNUInstallDirs)
6464
include(CheckSymbolExists)
65+
include(CheckIncludeFileCXX)
6566
include(AvailabilityMacros)
6667
include(CompilerSettings)
6768
include(DefaultSettings)
@@ -74,6 +75,8 @@ check_symbol_exists("asl_log" "asl.h" SwiftCore_HAS_ASL)
7475
check_symbol_exists("dladdr" "dlfcn.h" SwiftCore_HAS_DLADDR)
7576
check_symbol_exists("dlsym" "dlfcn.h" SwiftCore_HAS_DLSYM)
7677

78+
check_include_file_cxx("clocale" SwiftCore_HAS_LOCALE)
79+
7780
include("${SwiftCore_VENDOR_MODULE_DIR}/Settings.cmake" OPTIONAL)
7881

7982
defaulted_option(SwiftCore_ENABLE_LIBRARY_EVOLUTION "Generate ABI resilient runtime libraries")

Runtimes/Core/stubs/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ endif()
2828

2929
target_compile_definitions(swiftStdlibStubs PRIVATE
3030
$<$<BOOL:${BUILD_SHARED_LIBS}>:-DswiftCore_EXPORTS>
31-
$<$<BOOL:${SwiftCore_ENABLE_UNICODE_DATA}>:-DSWIFT_STDLIB_ENABLE_UNICODE_DATA>)
31+
$<$<BOOL:${SwiftCore_ENABLE_UNICODE_DATA}>:-DSWIFT_STDLIB_ENABLE_UNICODE_DATA>
32+
$<$<BOOL:${SwiftCore_HAS_LOCALE}>:-DSWIFT_STDLIB_HAS_LOCALE>)
3233

3334
target_link_libraries(swiftStdlibStubs PRIVATE
3435
swiftShims)

0 commit comments

Comments
 (0)