Merge pull request #62882 from etcwilde/ewilde/fix-zipper

xedin · web-flow · commit 9bbacdf94ca1 · 2023-01-06T11:10:35.000-08:00
Disable zippered catalyst builds again
diff --git a/stdlib/public/SwiftOnoneSupport/CMakeLists.txt b/stdlib/public/SwiftOnoneSupport/CMakeLists.txt
@@ -39,6 +39,7 @@ endif()
 add_swift_target_library(swiftSwiftOnoneSupport
   ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
   ${swiftOnoneSupport_common_options}
+  MACCATALYST_BUILD_FLAVOR "zippered"
   INSTALL_IN_COMPONENT stdlib)
 
 if(WINDOWS IN_LIST SWIFT_SDKS)
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -1234,7 +1234,6 @@ mixin-preset=mixin_buildbot_install_components_with_clang
 ios
 tvos
 watchos
-maccatalyst
 
 lldb
 llbuild

-Original file line number
+Diff line change
 ios
 tvos
 watchos
 -maccatalyst
 lldb
 llbuild