Move SWIFT_STDLIB_ENABLE_OBJC_INTEROP back to the main CMakeLists.txt (#39816)

Author: kubamracek

CMakeLists.txt

@@ -405,6 +405,18 @@ option(SWIFT_REPORT_STATISTICS
     "Create json files which contain internal compilation statistics"
     FALSE)
 
+# Only Darwin platforms enable ObjC interop by default.
+if("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
+  set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP_default TRUE)
+else()
+  set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP_default FALSE)
+endif()
+
+# Used by stdlib/toolchain as well, so this cannot be in stdlib/CMakeLists.txt
+option(SWIFT_STDLIB_ENABLE_OBJC_INTEROP
+       "Should stdlib be built with Obj-C interop."
+       "${SWIFT_STDLIB_ENABLE_OBJC_INTEROP_default}")
+
 #
 # User-configurable experimental options.  Do not use in production builds.
 #

stdlib/CMakeLists.txt

@@ -68,13 +68,6 @@ else()
   set(SWIFT_STDLIB_HAS_ASL_default FALSE)
 endif()
 
-# Only Darwin platforms enable ObjC interop by default.
-if("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
-  set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP_default TRUE)
-else()
-  set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP_default FALSE)
-endif()
-
 #
 # User-configurable options for the standard library.
 #
@@ -86,10 +79,6 @@ option(SWIFT_STDLIB_STABLE_ABI
        "Should stdlib be built with stable ABI (library evolution, resilience)."
        "${SWIFT_STDLIB_STABLE_ABI_default}")
 
-option(SWIFT_STDLIB_ENABLE_OBJC_INTEROP
-       "Should stdlib be built with Obj-C interop."
-       "${SWIFT_STDLIB_ENABLE_OBJC_INTEROP_default}")
-
 option(SWIFT_ENABLE_MODULE_INTERFACES
        "Generate .swiftinterface files alongside .swiftmodule files"
        "${SWIFT_STDLIB_STABLE_ABI}")