Merge pull request #3316 from compnerd/multiple-platforms

stdlib: build multiple platform libraries simultaneously

Author: compnerd

cmake/modules/AddSwift.cmake

@@ -1012,6 +1012,12 @@ endfunction()
 # SWIFT_MODULE_DEPENDS_WATCHOS
 #   Swift modules this library depends on when built for watchOS.
 #
+# SWIFT_MODULE_DEPENDS_FREEBSD
+#   Swift modules this library depends on when built for FreeBSD.
+#
+# SWIFT_MODULE_DEPENDS_LINUX
+#   Swift modules this library depends on when built for Linux.
+#
 # FRAMEWORK_DEPENDS
 #   System frameworks this library depends on.
 #
@@ -1076,7 +1082,7 @@ function(add_swift_library name)
   cmake_parse_arguments(SWIFTLIB
     "${SWIFTLIB_options}"
     "INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_IOS"
-    "DEPENDS;LINK_LIBRARIES;SWIFT_MODULE_DEPENDS;SWIFT_MODULE_DEPENDS_OSX;SWIFT_MODULE_DEPENDS_IOS;SWIFT_MODULE_DEPENDS_TVOS;SWIFT_MODULE_DEPENDS_WATCHOS;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;FRAMEWORK_DEPENDS_OSX;FRAMEWORK_DEPENDS_IOS_TVOS;COMPONENT_DEPENDS;FILE_DEPENDS;TARGET_SDKS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS_OSX;SWIFT_COMPILE_FLAGS_IOS;SWIFT_COMPILE_FLAGS_TVOS;SWIFT_COMPILE_FLAGS_WATCHOS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES"
+    "DEPENDS;LINK_LIBRARIES;SWIFT_MODULE_DEPENDS;SWIFT_MODULE_DEPENDS_OSX;SWIFT_MODULE_DEPENDS_IOS;SWIFT_MODULE_DEPENDS_TVOS;SWIFT_MODULE_DEPENDS_WATCHOS;SWIFT_MODULE_DEPENDS_FREEBSD;SWIFT_MODULE_DEPENDS_LINUX;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;FRAMEWORK_DEPENDS_OSX;FRAMEWORK_DEPENDS_IOS_TVOS;COMPONENT_DEPENDS;FILE_DEPENDS;TARGET_SDKS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS_OSX;SWIFT_COMPILE_FLAGS_IOS;SWIFT_COMPILE_FLAGS_TVOS;SWIFT_COMPILE_FLAGS_WATCHOS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES"
     ${ARGN})
   set(SWIFTLIB_SOURCES ${SWIFTLIB_UNPARSED_ARGUMENTS})
 
@@ -1195,6 +1201,12 @@ function(add_swift_library name)
         elseif("${sdk}" STREQUAL "WATCHOS" OR "${sdk}" STREQUAL "WATCHOS_SIMULATOR")
           list(APPEND swiftlib_module_depends_flattened
               ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WATCHOS})
+        elseif("${sdk}" STREQUAL "FREEBSD")
+          list(APPEND swiftlib_module_depends_flattened
+               ${SWIFTLIB_SWIFT_MODULE_DEPENDS_FREEBSD})
+        elseif("${sdk}" STREQUAL "LINUX")
+          list(APPEND swiftlib_module_depends_flattened
+              ${SWIFTLIB_SWIFT_MODULE_DEPENDS_LINUX})
         endif()
 
         set(swiftlib_module_dependency_targets)

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
 

stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt

@@ -1,21 +1,16 @@
-set(swift_private_darwin_extras_module_depends
-  SwiftPrivate)
-
-if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
-  list(APPEND swift_private_darwin_extras_module_depends
-    Darwin)
-elseif(SWIFT_HOST_VARIANT STREQUAL "linux" OR SWIFT_HOST_VARIANT STREQUAL "freebsd")
-  list(APPEND swift_private_darwin_extras_module_depends
-    Glibc)
-endif()
-
 add_swift_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivateLibcExtras.swift
   Subprocess.c
   Subprocess.swift
 
-  SWIFT_MODULE_DEPENDS ${swift_private_darwin_extras_module_depends}
+  SWIFT_MODULE_DEPENDS SwiftPrivate
   SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
+  SWIFT_MODULE_DEPENDS_OSX Darwin
+  SWIFT_MODULE_DEPENDS_IOS Darwin
+  SWIFT_MODULE_DEPENDS_TVOS Darwin
+  SWIFT_MODULE_DEPENDS_WATCHOS Darwin
+  SWIFT_MODULE_DEPENDS_LINUX Glibc
+  SWIFT_MODULE_DEPENDS_FREEBSD Glibc
   INSTALL_IN_COMPONENT stdlib-experimental)

stdlib/private/SwiftPrivatePthreadExtras/CMakeLists.txt

@@ -1,20 +1,15 @@
-set(swift_private_pthread_extras_module_depends)
-
-if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
-  list(APPEND swift_private_pthread_extras_module_depends
-    Darwin)
-elseif(SWIFT_HOST_VARIANT STREQUAL "linux" OR SWIFT_HOST_VARIANT STREQUAL "freebsd")
-  list(APPEND swift_private_pthread_extras_module_depends
-    Glibc)
-endif()
-
 add_swift_library(swiftSwiftPrivatePthreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivatePthreadExtras.swift
   PthreadBarriers.swift
 
-  SWIFT_MODULE_DEPENDS ${swift_private_pthread_extras_module_depends}
+  SWIFT_MODULE_DEPENDS_IOS Darwin
+  SWIFT_MODULE_DEPENDS_OSX Darwin
+  SWIFT_MODULE_DEPENDS_TVOS Darwin
+  SWIFT_MODULE_DEPENDS_WATCHOS Darwin
+  SWIFT_MODULE_DEPENDS_LINUX Glibc
+  SWIFT_MODULE_DEPENDS_FREEBSD Glibc
   SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
   INSTALL_IN_COMPONENT stdlib-experimental)
 

stdlib/public/Platform/CMakeLists.txt

@@ -6,28 +6,21 @@ set(swift_platform_sources
     TiocConstants.swift
     tgmath.swift.gyb)
 
-if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
-  set(swift_platform_name swiftDarwin)
-  set(swift_platform_sources
-      Darwin.swift
-      ${swift_platform_sources}
-      POSIXError.swift
-      MachError.swift)
-  set(swift_platform_flags
-      SWIFT_COMPILE_FLAGS -Xfrontend -disable-objc-attr-requires-foundation-module
-      API_NOTES_NON_OVERLAY)
-else()
-  set(swift_platform_name swiftGlibc)
-  set(swift_platform_sources
-      Glibc.swift
-      ${swift_platform_sources})
-  set(swift_platform_flags
-      DEPENDS glibc_modulemap)
-endif()
+add_swift_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
+    Darwin.swift
+    ${swift_platform_sources}
+    POSIXError.swift
+    MachError.swift
+
+    SWIFT_COMPILE_FLAGS -Xfrontend -disable-objc-attr-requires-foundation-module
+    TARGET_SDKS IOS IOS_SIMULATOR OSX TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
+    API_NOTES_NON_OVERLAY)
 
-add_swift_library(${swift_platform_name} ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
+add_swift_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
+    Glibc.swift
     ${swift_platform_sources}
-    ${swift_platform_flags})
+    TARGET_SDKS ANDROID CYGWIN FREEBSD LINUX
+    DEPENDS glibc_modulemap)
 
 set(glibc_modulemap_target_list)
 foreach(sdk ${SWIFT_SDKS})