build: support multiple builds of StdlibUnittest

Author: compnerd

stdlib/private/StdlibUnittest/CMakeLists.txt

@@ -1,31 +1,19 @@
-set(swift_stdlib_unittest_platform_sources)
-set(swift_stdlib_unittest_module_depends
-  SwiftPrivate SwiftPrivatePthreadExtras SwiftPrivateLibcExtras)
-set(swift_stdlib_unittest_framework_depends)
+
 set(swift_stdlib_unittest_compile_flags
   "-Xfrontend" "-disable-objc-attr-requires-foundation-module")
-
 if (SWIFT_RUNTIME_ENABLE_LEAK_CHECKER)
   list(APPEND swift_stdlib_unittest_compile_flags "-DSWIFT_RUNTIME_ENABLE_LEAK_CHECKER")
 endif()
-
-if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
-  list(APPEND swift_stdlib_unittest_platform_sources
-    GetOSVersion.mm)
-  list(APPEND swift_stdlib_unittest_module_depends
-    Darwin
-    Foundation)
-  list(APPEND swift_stdlib_unittest_framework_depends
-    Foundation)
-endif()
-if(SWIFT_HOST_VARIANT STREQUAL "linux" OR SWIFT_HOST_VARIANT STREQUAL "freebsd")
-  list(APPEND swift_stdlib_unittest_module_depends
-    Glibc)
-endif()
 if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
   list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
 endif()
 
+# TODO: extend this through a similar mechanism to SWIFT_MODULE_DEPENDS
+set(swift_stdlib_unittest_framework_depends)
+if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
+  list(APPEND swift_stdlib_unittest_framework_depends Foundation)
+endif()
+
 add_swift_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
@@ -42,9 +30,15 @@ add_swift_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STD
   StringConvertible.swift.gyb
   TestHelpers.swift
   TypeIndexed.swift
-  ${swift_stdlib_unittest_platform_sources}
+  GetOSVersion.mm
 
-  SWIFT_MODULE_DEPENDS ${swift_stdlib_unittest_module_depends}
+  SWIFT_MODULE_DEPENDS SwiftPrivate SwiftPrivatePthreadExtras SwiftPrivateLibcExtras
+  SWIFT_MODULE_DEPENDS_IOS Darwin Foundation
+  SWIFT_MODULE_DEPENDS_OSX Darwin Foundation
+  SWIFT_MODULE_DEPENDS_TVOS Darwin Foundation
+  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Foundation
+  SWIFT_MODULE_DEPENDS_LINUX Glibc
+  SWIFT_MODULE_DEPENDS_FREEBSD Glibc
   SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags}
   FRAMEWORK_DEPENDS ${swift_stdlib_unittest_framework_depends}
   INSTALL_IN_COMPONENT stdlib-experimental)

stdlib/private/StdlibUnittest/GetOSVersion.mm

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if defined(__APPLE__)
 #include <Foundation/Foundation.h>
 
 #include "swift/Runtime/Config.h"
@@ -33,4 +34,5 @@
   [SystemVersion release];
   return Result;
 }
+#endif