[cxx-interop] Make Cxx Swift library static

egorzhdan · egorzhdan · commit 82381053f26e · 2022-09-16T18:42:44.000+01:00
Instead of a dynamic `swiftCxx.dylib` library, let's build a static library to simplify backdeployment and reduce potential compatibility difficulties in the future.
diff --git a/stdlib/public/Cxx/CMakeLists.txt b/stdlib/public/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_target_library(swiftCxx ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
+add_swift_target_library(swiftCxx STATIC IS_SDK_OVERLAY
     CxxSequence.swift
 
     SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
diff --git a/stdlib/public/Cxx/std/CMakeLists.txt b/stdlib/public/Cxx/std/CMakeLists.txt
@@ -127,7 +127,7 @@ add_dependencies(sdk-overlay libstdcxx-modulemap)
 #
 # C++ Standard Library Overlay.
 #
-add_swift_target_library(swiftstd ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
+add_swift_target_library(swiftstd STATIC IS_SDK_OVERLAY
     std.swift
     String.swift
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-add_swift_target_library(swiftCxx ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY`
	`1`	`+add_swift_target_library(swiftCxx STATIC IS_SDK_OVERLAY`
`2`	`2`	`CxxSequence.swift`
`3`	`3`
`4`	`4`	`SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ add_dependencies(sdk-overlay libstdcxx-modulemap)`
`127`	`127`	`#`
`128`	`128`	`# C++ Standard Library Overlay.`
`129`	`129`	`#`
`130`		`-add_swift_target_library(swiftstd ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY`
	`130`	`+add_swift_target_library(swiftstd STATIC IS_SDK_OVERLAY`
`131`	`131`	`std.swift`
`132`	`132`	`String.swift`
`133`	`133`