File tree Expand file tree Collapse file tree 2 files changed +16
-5
lines changed Expand file tree Collapse file tree 2 files changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -58,9 +58,17 @@ set(SWIFT_NATIVE_CLANG_TOOLS_PATH "${TOOLCHAIN_DIR}/usr/bin" CACHE STRING
5858set (SWIFT_NATIVE_SWIFT_TOOLS_PATH "${TOOLCHAIN_DIR} /usr/bin" CACHE STRING
5959 "Path to Swift tools that are executable on the build machine." )
6060
61+ # NOTE: The initialization in stdlib/CMakeLists.txt will be bypassed if we
62+ # directly invoke CMake for this directory, so we initialize the variables
63+ # related to library evolution here as well.
64+
65+ option (SWIFT_STDLIB_STABLE_ABI
66+ "Should stdlib be built with stable ABI (library evolution, resilience)."
67+ TRUE )
68+
6169option (SWIFT_ENABLE_MODULE_INTERFACES
6270 "Generate .swiftinterface files alongside .swiftmodule files."
63- TRUE )
71+ " ${SWIFT_STDLIB_STABLE_ABI} " )
6472
6573set (SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE} " CACHE STRING
6674 "Build type for the Swift standard library and SDK overlays." )
Original file line number Diff line number Diff line change @@ -42,10 +42,17 @@ endif()
4242# User-configurable options for the standard library.
4343#
4444
45+ # NOTE: Some of these variables are also initialized in StandaloneOverlay.cmake
46+ # so that interfaces are emitted when overlays are separately built.
47+
4548option (SWIFT_STDLIB_STABLE_ABI
4649 "Should stdlib be built with stable ABI (library evolution, resilience)."
4750 "${SWIFT_STDLIB_STABLE_ABI_default} " )
4851
52+ option (SWIFT_ENABLE_MODULE_INTERFACES
53+ "Generate .swiftinterface files alongside .swiftmodule files"
54+ "${SWIFT_STDLIB_STABLE_ABI} " )
55+
4956option (SWIFT_ENABLE_COMPATIBILITY_OVERRIDES
5057 "Support back-deploying compatibility fixes for newer apps running on older runtimes."
5158 TRUE )
@@ -62,10 +69,6 @@ option(SWIFT_STDLIB_OS_VERSIONING
6269 "Build stdlib with availability based on OS versions (Darwin only)."
6370 TRUE )
6471
65- option (SWIFT_ENABLE_MODULE_INTERFACES
66- "Generate .swiftinterface files alongside .swiftmodule files"
67- "${SWIFT_STDLIB_STABLE_ABI} " )
68-
6972option (SWIFT_COMPILE_DIFFERENTIATION_WITHOUT_TGMATH
7073 "Build Differentation without tgmath (and dependency on platform runtime libraries)"
7174 FALSE )
You can’t perform that action at this time.
0 commit comments