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
58
58
set (SWIFT_NATIVE_SWIFT_TOOLS_PATH "${TOOLCHAIN_DIR} /usr/bin" CACHE STRING
59
59
"Path to Swift tools that are executable on the build machine." )
60
60
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
+
61
69
option (SWIFT_ENABLE_MODULE_INTERFACES
62
70
"Generate .swiftinterface files alongside .swiftmodule files."
63
- TRUE )
71
+ " ${SWIFT_STDLIB_STABLE_ABI} " )
64
72
65
73
set (SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE} " CACHE STRING
66
74
"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()
42
42
# User-configurable options for the standard library.
43
43
#
44
44
45
+ # NOTE: Some of these variables are also initialized in StandaloneOverlay.cmake
46
+ # so that interfaces are emitted when overlays are separately built.
47
+
45
48
option (SWIFT_STDLIB_STABLE_ABI
46
49
"Should stdlib be built with stable ABI (library evolution, resilience)."
47
50
"${SWIFT_STDLIB_STABLE_ABI_default} " )
48
51
52
+ option (SWIFT_ENABLE_MODULE_INTERFACES
53
+ "Generate .swiftinterface files alongside .swiftmodule files"
54
+ "${SWIFT_STDLIB_STABLE_ABI} " )
55
+
49
56
option (SWIFT_ENABLE_COMPATIBILITY_OVERRIDES
50
57
"Support back-deploying compatibility fixes for newer apps running on older runtimes."
51
58
TRUE )
@@ -62,10 +69,6 @@ option(SWIFT_STDLIB_OS_VERSIONING
62
69
"Build stdlib with availability based on OS versions (Darwin only)."
63
70
TRUE )
64
71
65
- option (SWIFT_ENABLE_MODULE_INTERFACES
66
- "Generate .swiftinterface files alongside .swiftmodule files"
67
- "${SWIFT_STDLIB_STABLE_ABI} " )
68
-
69
72
option (SWIFT_COMPILE_DIFFERENTIATION_WITHOUT_TGMATH
70
73
"Build Differentation without tgmath (and dependency on platform runtime libraries)"
71
74
FALSE )
You can’t perform that action at this time.
0 commit comments