Replace SWIFT_SDKS with SWIFT_CROSS_COMPILE_STDLIB_TARGETS

springsup · springsup · commit d9ba41dc5cef · 2016-06-09T21:15:04.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -199,7 +199,7 @@ endforeach()
 
 set(executable_targets)
 
-if(SWIFT_SDKS)
+if(SWIFT_CONFIGURED_SDKS)
   set(IS_SWIFT_BUILD true)
 endif()
 
diff --git a/benchmark/scripts/generate_harness/CMakeLists.txt_template b/benchmark/scripts/generate_harness/CMakeLists.txt_template
@@ -137,7 +137,7 @@ endforeach()
 
 set(executable_targets)
 
-if(SWIFT_SDKS)
+if(SWIFT_CONFIGURED_SDKS)
   set(IS_SWIFT_BUILD true)
 endif()
 
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -1034,9 +1034,9 @@ function(add_swift_library name)
     set(SWIFTLIB_INSTALL_IN_COMPONENT dev)
   endif()
 
-  # If target SDKs are not specified, build for all known SDKs.
+  # If target SDKs are not specified, build for all configured SDKs.
   if("${SWIFTLIB_TARGET_SDKS}" STREQUAL "")
-    set(SWIFTLIB_TARGET_SDKS ${SWIFT_SDKS})
+    set(SWIFTLIB_TARGET_SDKS ${SWIFT_CONFIGURED_SDKS})
   endif()
 
   # All Swift code depends on the standard library, except for the standard
@@ -1083,12 +1083,13 @@ function(add_swift_library name)
     # If we are building this library for targets, loop through the various
     # SDKs building the variants of this library.
     list_intersect(
-        "${SWIFTLIB_TARGET_SDKS}" "${SWIFT_SDKS}" SWIFTLIB_TARGET_SDKS)
-    if(SWIFTLIB_HOST_LIBRARY)
+        "${SWIFTLIB_TARGET_SDKS}" "${SWIFT_CONFIGURED_SDKS}" SWIFTLIB_TARGET_SDKS)
+    if(SWIFTLIB_HOST_LIBRARY AND NOT SWIFT_SKIP_HOST_STDLIB)
       list_union(
           "${SWIFTLIB_TARGET_SDKS}" "${SWIFT_HOST_VARIANT_SDK}"
           SWIFTLIB_TARGET_SDKS)
     endif()
+
     foreach(sdk ${SWIFTLIB_TARGET_SDKS})
       set(THIN_INPUT_TARGETS)
 
@@ -1245,7 +1246,6 @@ function(add_swift_library name)
 
         # Determine the subdirectory where this library will be installed.
         set(resource_dir_sdk_subdir "${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
-
         if("${resource_dir_sdk_subdir}" STREQUAL "")
           message(FATAL_ERROR "internal error: the variable should be non-empty")
         endif()
@@ -1538,7 +1538,7 @@ function(add_swift_target_executable name)
         swiftCore)
   endif()
 
-  foreach(sdk ${SWIFT_SDKS})
+  foreach(sdk ${SWIFT_CONFIGURED_SDKS})
     foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
       set(VARIANT_SUFFIX "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
       set(VARIANT_NAME "${name}${VARIANT_SUFFIX}")
diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake
@@ -3,7 +3,7 @@
 # Each element in this list is an SDK for which the various
 # SWIFT_SDK_${name}_* variables are defined. Swift libraries will be
 # built for each variant.
-set(SWIFT_CONFIGURED_SDKS)
+set(SWIFT_CONFIGURED_SDKS "")
 
 # Report the given SDK to the user.
 function(_report_sdk prefix)
@@ -61,6 +61,22 @@ macro(configure_sdk_darwin
   # Note: this has to be implemented as a macro because it sets global
   # variables.
 
+  # Because we calculate our own triple, we need to validate
+  # architectures here.
+
+  set(OSX_VALID_ARCHITECTURES "x86_64")
+  set(IOS_VALID_ARCHITECTURES "armv7;armv7s;arm64")
+  set(TVOS_VALID_ARCHITECTURES "arm64")
+  set(WATCHOS_VALID_ARCHITECTURES "armv7k")
+  set(IOS_SIMULATOR_VALID_ARCHITECTURES "i386;x86_64")
+  set(TVOS_SIMULATOR_VALID_ARCHITECTURES "x86_64")
+  set(WATCHOS_SIMULATOR_VALID_ARCHITECTURES "i386")
+
+  list_subtract("${architectures}" "${${prefix}_VALID_ARCHITECTURES}" invalid_archs)
+  if(invalid_archs)
+    message(FATAL_ERROR "${invalid_archs} are not recognised architectures for ${name}")
+  endif()
+
   # Find the SDK
   set(SWIFT_SDK_${prefix}_PATH "" CACHE PATH "Path to the ${name} SDK")
 
@@ -104,6 +120,8 @@ macro(configure_sdk_darwin
 
   # Add this to the list of known SDKs.
   list(APPEND SWIFT_CONFIGURED_SDKS "${prefix}")
+  set(SWIFT_CONFIGURED_SDKS "${SWIFT_CONFIGURED_SDKS}" CACHE STRING
+      "The SDKs which have been configured to build")
 
   _report_sdk("${prefix}")
 endmacro()
@@ -127,6 +145,8 @@ macro(configure_sdk_unix
 
   # Add this to the list of known SDKs.
   list(APPEND SWIFT_CONFIGURED_SDKS "${prefix}")
+  set(SWIFT_CONFIGURED_SDKS "${SWIFT_CONFIGURED_SDKS}" CACHE STRING
+      "The SDKs which have been configured to build")
 
   _report_sdk("${prefix}")
 endmacro()
diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
@@ -11,7 +11,7 @@ else()
 endif()
 
 add_custom_target(swift-stdlib-all)
-foreach(SDK ${SWIFT_SDKS})
+foreach(SDK ${SWIFT_CONFIGURED_SDKS})
   add_custom_target("swift-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")
   add_custom_target("swift-test-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")
   foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
diff --git a/stdlib/private/SwiftReflectionTest/CMakeLists.txt b/stdlib/private/SwiftReflectionTest/CMakeLists.txt
@@ -3,7 +3,7 @@ add_swift_library(swiftSwiftReflectionTest SHARED IS_STDLIB
   SWIFT_MODULE_DEPENDS Darwin
   INSTALL_IN_COMPONENT stdlib-experimental)
 
-foreach(SDK ${SWIFT_SDKS})
+foreach(SDK ${SWIFT_CONFIGURED_SDKS})
   foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
     set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
     add_dependencies(
diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt
@@ -29,7 +29,7 @@ add_swift_library(${swift_platform_name} IS_SDK_OVERLAY
     ${swift_platform_flags})
 
 set(glibc_modulemap_target_list)
-foreach(sdk ${SWIFT_SDKS})
+foreach(sdk ${SWIFT_CONFIGURED_SDKS})
   if("${sdk}" STREQUAL "LINUX" OR
      "${sdk}" STREQUAL "FREEBSD" OR
      "${sdk}" STREQUAL "ANDROID" OR
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -139,7 +139,7 @@ if(PYTHONINTERP_FOUND)
       only_long
   )
 
-  foreach(SDK ${SWIFT_SDKS})
+  foreach(SDK ${SWIFT_CONFIGURED_SDKS})
     foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
       # Configure variables for this subdirectory.
       set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
diff --git a/utils/SwiftBuildSupport.py b/utils/SwiftBuildSupport.py
@@ -142,7 +142,8 @@ def get_preset_options(substitutions, preset_file_names, preset_name):
         diagnostics.fatal("missing option(s) for preset '" + preset_name +
                           "': " + ", ".join(missing_opts))
 
-    # Migrate 'swift-sdks' parameter to 'stdlib-deployment-targets'
+    # Migrate 'swift-sdks' parameter to
+    # 'cross-compile-stdlib-deployment-targets'
     for opt in build_script_impl_opts:
         if opt.startswith("--swift-sdks"):
             sdks_to_configure = opt.split("=")[1].split(";")
@@ -164,8 +165,10 @@ def get_preset_options(substitutions, preset_file_names, preset_name):
                     tgts += StdlibDeploymentTarget.AppleWatch.targets
                 elif sdk == "WATCHOS_SIMULATOR":
                     tgts += StdlibDeploymentTarget.AppleWatchSimulator.targets
+            tgts = [x for x in tgts
+                    if x != StdlibDeploymentTarget.host_target()]
 
-            build_script_opts.append("--stdlib-deployment-targets=" +
+            build_script_opts.append("--cross-compile-stdlib-deployment-targets=" +
                                      " ".join([tgt.name for tgt in tgts]))
     # Filter the swift-sdks parameter
     build_script_impl_opts = [opt for opt in build_script_impl_opts
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -74,7 +74,7 @@ skip-build-tvos
 skip-test-tvos
 skip-build-watchos
 skip-test-watchos
-stdlib-deployment-targets=macosx-x86_64
+cross-compile-stdlib-deployment-targets=''
 swift-primary-variant-sdk=OSX
 swift-primary-variant-arch=x86_64
 
diff --git a/utils/build-script b/utils/build-script
@@ -71,47 +71,57 @@ class HostSpecificConfiguration(object):
     def __init__(self, host_target, invocation):
         """Initialize for the given `host_target`."""
 
-        # Compute the set of deployment targets to configure/build.
         args = invocation.args
+
+        # [*] Compute the list of deployment targets to configure.
+        #
+        #  We only need to configure cross-compiled stdlib targets.
+        #  The host_target is implicitly configured by CMake.
+
+        self.host_target = StdlibDeploymentTarget\
+            .get_target_for_name(host_target)
+        if self.host_target is None:
+                diagnostics.fatal("unknown host target: %r" % (
+                    host_target))
+
+        self.stdlib_targets_to_configure = []
+        # FIXME: Cross-compiled hosts don't support cross-compiled targets
+        # or filtering build lists, only because we don't
+        # have an argument structure to define them for NxM hosts and targets.
         if host_target == args.host_target:
-            # This host is the user's desired product, so honor the requested
-            # set of targets to configure/build.
-            stdlib_targets_to_configure = args.stdlib_deployment_targets
-            if "all" in args.build_stdlib_deployment_targets:
-                stdlib_targets_to_build = set(stdlib_targets_to_configure)
-            else:
-                stdlib_targets_to_build = set(
-                    args.build_stdlib_deployment_targets).intersect(
-                        set(args.stdlib_deployment_targets))
-        else:
-            # Otherwise, this is a host we are building as part of
-            # cross-compiling, so we only need the target itself.
-            stdlib_targets_to_configure = [host_target]
-            stdlib_targets_to_build = set(stdlib_targets_to_configure)
-
-        # Compute the lists of **CMake** targets for each use case (configure
-        # vs. build vs. run) and the SDKs to configure with.
-        self.sdks_to_configure = set()
+            for name in args.cross_compile_stdlib_deployment_targets:
+                dpymt_target = StdlibDeploymentTarget.get_target_for_name(name)
+                if dpymt_target is None:
+                    diagnostics.fatal("unknown stdlib target: %r" % (
+                        name))
+                else:
+                    self.stdlib_targets_to_configure.append(dpymt_target)
+
+        # [*] Compute the list of deployment targets to build.
+        #
+        # Even though we don't need to configure host_target, we do need
+        # to explicitly build it.
+        # So by default, build all configured targets + the host
+
+        self.stdlib_targets_to_build = [self.host_target]
+        self.stdlib_targets_to_build += self.stdlib_targets_to_configure
+
+        if host_target == args.host_target and \
+                "all" not in args.build_stdlib_deployment_targets:
+            self.stdlib_targets_to_build = \
+                [t for t in self.stdlib_targets_to_build
+                 if t.name in args.build_stdlib_deployment_targets]
+
+        # [*] Compute the lists of **CMake** build/run targets
+
         self.swift_stdlib_build_targets = []
         self.swift_test_run_targets = []
         self.swift_benchmark_build_targets = []
         self.swift_benchmark_run_targets = []
-        for deployment_target_name in stdlib_targets_to_configure:
-            # Get the target object.
-            deployment_target = StdlibDeploymentTarget.get_target_for_name(
-                deployment_target_name)
-            if deployment_target is None:
-                diagnostics.fatal("unknown target: %r" % (
-                    deployment_target_name,))
-
-            # Add the SDK to use.
-            deployment_platform = deployment_target.platform
-            self.sdks_to_configure.add(deployment_platform.sdk_name)
+        for deployment_target in self.stdlib_targets_to_build:
 
-            # If we aren't actually building this target (only configuring
-            # it), do nothing else.
-            if deployment_target_name not in stdlib_targets_to_build:
-                continue
+            deployment_platform = deployment_target.platform
+            name = deployment_target.name
 
             # Compute which actions are desired.
             build = (
@@ -130,19 +140,18 @@ class HostSpecificConfiguration(object):
                deployment_platform.is_embedded and \
                not deployment_platform.is_simulator:
                 if deployment_platform not in \
-                       invocation.platforms_to_skip_test_host:
+                        invocation.platforms_to_skip_test_host:
                     test_host_only = True
                     test = True
                 else:
                     test = False
 
-            name = deployment_target.name
             if build:
                 # Validation and long tests require building the full standard
                 # library, whereas the other targets can build a slightly
                 # smaller subset which is faster to build.
                 if args.build_swift_stdlib_unittest_extra or \
-                       args.validation_test or args.long_test:
+                        args.validation_test or args.long_test:
                     self.swift_stdlib_build_targets.append(
                         "swift-stdlib-" + name)
                 else:
@@ -198,7 +207,7 @@ class BuildScriptInvocation(object):
                 diagnostics.fatal(
                     "can't find distcc-pump (please install distcc-pump)")
 
-        if args.host_target is None or args.stdlib_deployment_targets is None:
+        if args.host_target is None:
             diagnostics.fatal("unknown operating system")
 
         if args.symbols_package:
@@ -390,9 +399,9 @@ class BuildScriptInvocation(object):
             args.build_subdir = \
                 swift_build_support.workspace.compute_build_subdir(args)
 
-        # Add optional stdlib-deployment-targets
+        # Add optional cross-compile-stdlib-deployment-targets
         if args.android:
-            args.stdlib_deployment_targets.append(
+            args.cross_compile_stdlib_deployment_targets.append(
                 StdlibDeploymentTarget.Android.armv7.name)
 
     def __init__(self, toolchain, args):
@@ -525,8 +534,6 @@ class BuildScriptInvocation(object):
             "--build-dir", self.workspace.build_root,
             "--install-prefix", args.install_prefix,
             "--host-target", args.host_target,
-            "--stdlib-deployment-targets",
-            " ".join(args.stdlib_deployment_targets),
             "--host-cc", toolchain.cc,
             "--host-cxx", toolchain.cxx,
             "--darwin-xcrun-toolchain", args.darwin_xcrun_toolchain,
@@ -559,10 +566,24 @@ class BuildScriptInvocation(object):
                 pipes.quote(arg) for arg in cmake.build_args()),
         ]
 
+        # Specify additional stdlib targets to configure. Remove zero-length
+        # names.
+        args.cross_compile_stdlib_deployment_targets = \
+            [t for t in args.cross_compile_stdlib_deployment_targets
+             if len(t) > 0]
+
+        if args.cross_compile_stdlib_deployment_targets is not None and \
+                len(args.cross_compile_stdlib_deployment_targets) > 0 and \
+                'none' not in args.cross_compile_stdlib_deployment_targets:
+            impl_args += ["--cross-compile-stdlib-deployment-targets",
+                          " ".join(
+                              args.cross_compile_stdlib_deployment_targets)]
+        # Specify stdlib targets to build
         if args.build_stdlib_deployment_targets:
             impl_args += [
                 "--build-stdlib-deployment-targets", " ".join(
                     args.build_stdlib_deployment_targets)]
+        # Specify additional hosts to configure + build
         if args.cross_compile_hosts:
             impl_args += [
                 "--cross-compile-hosts", " ".join(args.cross_compile_hosts)]
@@ -759,16 +780,18 @@ class BuildScriptInvocation(object):
             config = HostSpecificConfiguration(host_target, self)
 
             # Convert into `build-script-impl` style variables.
+            stdlib_target_names = [t.name for t
+                                   in config.stdlib_targets_to_configure]
             options[host_target] = {
-                "SWIFT_SDKS": " ".join(sorted(
-                    config.sdks_to_configure)),
-                "SWIFT_STDLIB_TARGETS": " ".join(
+                "SWIFT_CROSS_COMPILE_STDLIB_TARGETS": " ".join(
+                    stdlib_target_names),
+                "SWIFT_STDLIB_BUILD_TARGETS": " ".join(
                     config.swift_stdlib_build_targets),
-                "SWIFT_BENCHMARK_TARGETS": " ".join(
+                "SWIFT_BENCHMARK_BUILD_TARGETS": " ".join(
                     config.swift_benchmark_build_targets),
-                "SWIFT_RUN_BENCHMARK_TARGETS": " ".join(
+                "SWIFT_BENCHMARK_RUN_TARGETS": " ".join(
                     config.swift_benchmark_run_targets),
-                "SWIFT_TEST_TARGETS": " ".join(
+                "SWIFT_TEST_RUN_TARGETS": " ".join(
                     config.swift_test_run_targets),
             }
 
@@ -1057,15 +1080,14 @@ details of the setups of other systems or automated environments.""")
              "tools for. Can be used multiple times.",
         action=arguments.action.concat, type=arguments.type.shell_split,
         default=[])
-    stdlib_targets = StdlibDeploymentTarget.default_stdlib_deployment_targets()
+    default_cross_stdlib_targets = StdlibDeploymentTarget\
+        .default_cross_compile_stdlib_targets()
     targets_group.add_argument(
-        "--stdlib-deployment-targets",
-        help="list of targets to compile or cross-compile the Swift standard "
+        "--cross-compile-stdlib-deployment-targets",
+        help="list of targets to cross-compile the Swift standard "
              "library for. %(default)s by default.",
         nargs="*",
-        default=[
-            target.name
-            for target in stdlib_targets])
+        default=[t.name for t in default_cross_stdlib_targets])
     targets_group.add_argument(
         "--build-stdlib-deployment-targets",
         help="A space-separated list that filters which of the configured "
diff --git a/utils/build-script-impl b/utils/build-script-impl
diff --git a/utils/swift_build_support/swift_build_support/targets.py b/utils/swift_build_support/swift_build_support/targets.py

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ if(PYTHONINTERP_FOUND)`
`139`	`139`	`only_long`
`140`	`140`	`)`
`141`	`141`
`142`		`- foreach(SDK ${SWIFT_SDKS})`
	`142`	`+ foreach(SDK ${SWIFT_CONFIGURED_SDKS})`
`143`	`143`	`foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})`
`144`	`144`	`# Configure variables for this subdirectory.`
`145`	`145`	`set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")`