[Build] Updated following initial comments from Eric.

Change the `--linux[-static]-arch` option to `--linux[-static]-archs`, on the
basis that it supports multiple values.

Other tidying.

rdar://123503470

Author: al45tair

CMakeLists.txt

@@ -1107,7 +1107,6 @@ if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "LINUX")
   set(SWIFT_HOST_VARIANT "linux" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [linux].")
 
-  # Should we build the standard library for the host?
   is_sdk_requested(LINUX swift_build_linux)
   if(swift_build_linux)
     if("${SWIFT_SDK_LINUX_ARCHITECTURES}" STREQUAL "")
@@ -1117,7 +1116,6 @@ if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "LINUX")
     configure_sdk_unix("Linux" "${SWIFT_SDK_LINUX_ARCHITECTURES}")
   endif()
 
-  # Should we build it for LINUX_STATIC?
   is_sdk_requested(LINUX_STATIC swift_build_linux_static)
   if(swift_build_linux_static)
     if("${SWIFT_MUSL_PATH}" STREQUAL "")

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -2089,10 +2089,10 @@ function(add_swift_target_library name)
     elseif(sdk STREQUAL "LINUX" OR sdk STREQUAL "ANDROID")
       list(APPEND swiftlib_module_depends_flattened
            ${SWIFTLIB_SWIFT_MODULE_DEPENDS_LINUX})
-    elseif(${sdk} STREQUAL "LINUX_STATIC")
+    elseif(sdk STREQUAL "LINUX_STATIC")
       list(APPEND swiftlib_module_depends_flattened
           ${SWIFTLIB_SWIFT_MODULE_DEPENDS_LINUX_STATIC})
-    elseif(${sdk} STREQUAL "CYGWIN")
+    elseif(sdk STREQUAL "CYGWIN")
       list(APPEND swiftlib_module_depends_flattened
            ${SWIFTLIB_SWIFT_MODULE_DEPENDS_CYGWIN})
     elseif(sdk STREQUAL "HAIKU")
@@ -2349,19 +2349,19 @@ function(add_swift_target_library name)
 
       # If the SDK is static only, always build static instead of dynamic
       if(SWIFT_SDK_${sdk}_STATIC_ONLY AND SWIFTLIB_SHARED)
-        set(shared)
-        set(static STATIC)
+        set(shared_keyword)
+        set(static_keyword STATIC)
       else()
-        set(shared ${SWIFTLIB_SHARED_keyword})
-        set(static ${SWIFTLIB_STATIC_keyword})
+        set(shared_keyword ${SWIFTLIB_SHARED_keyword})
+        set(static_keyword ${SWIFTLIB_STATIC_keyword})
       endif()
 
       # Add this library variant.
       add_swift_target_library_single(
         ${variant_name}
         ${name}
-        ${shared}
-        ${static}
+        ${shared_keyword}
+        ${static_keyword}
         ${SWIFTLIB_NO_LINK_NAME_keyword}
         ${SWIFTLIB_OBJECT_LIBRARY_keyword}
         ${SWIFTLIB_INSTALL_WITH_SHARED_keyword}
@@ -2420,19 +2420,23 @@ function(add_swift_target_library name)
 
       if(NOT SWIFTLIB_OBJECT_LIBRARY)
         # Add dependencies on the (not-yet-created) custom lipo target.
-        foreach(dep ${SWIFTLIB_LINK_LIBRARIES})
-          if (NOT "${dep}" MATCHES "^(icucore|dispatch|BlocksRuntime)($|-.*)$")
+        foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
+          if (NOT "${DEP}" MATCHES "^icucore($|-.*)$" AND
+              NOT "${DEP}" MATCHES "^dispatch($|-.*)$" AND
+              NOT "${DEP}" MATCHES "^BlocksRuntime($|-.*)$")
             add_dependencies(${VARIANT_NAME}
-              "${dep}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
+              "${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
           endif()
         endforeach()
 
         if (SWIFTLIB_IS_STDLIB AND SWIFTLIB_STATIC)
           # Add dependencies on the (not-yet-created) custom lipo target.
-          foreach(dep ${SWIFTLIB_LINK_LIBRARIES})
-            if (NOT "${dep}" MATCHES "^(icucore|dispatch|BlocksRuntime)($|-.*)$")
+          foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
+          if (NOT "${DEP}" MATCHES "^icucore($|-.*)$" AND
+              NOT "${DEP}" MATCHES "^dispatch($|-.*)$" AND
+              NOT "${DEP}" MATCHES "^BlocksRuntime($|-.*)$")
               add_dependencies("${VARIANT_NAME}-static"
-                "${dep}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-static")
+                "${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-static")
             endif()
           endforeach()
         endif()

utils/build-script

@@ -278,12 +278,13 @@ def default_stdlib_deployment_targets(args):
     if host_target is None:
         return None
 
+    targets = [host_target]
+
     # OS X build machines configure all Darwin platforms by default.
     # Put iOS native targets last so that we test them last
     # (it takes a long time).
     if host_target == StdlibDeploymentTarget.OSX.x86_64 or \
             host_target == StdlibDeploymentTarget.OSX.arm64:
-        targets = [host_target]
         if args.build_ios and args.build_ios_simulator:
             targets.extend(StdlibDeploymentTarget.iOSSimulator.targets)
         if args.build_ios and args.build_ios_device:
@@ -305,14 +306,11 @@ def default_stdlib_deployment_targets(args):
             targets.extend(StdlibDeploymentTarget.XROS.targets)
         return targets
     elif host_target.platform.name == 'linux':
-        targets = [host_target]
         if args.build_linux_static:
             targets.append(getattr(StdlibDeploymentTarget.Musl,
                                    host_target.arch))
-        return targets
-    else:
-        # All other machines only configure their host stdlib by default.
-        return [host_target]
+
+    return targets
 
 
 def apply_default_arguments(toolchain, args):

utils/build-script-impl

@@ -95,8 +95,8 @@ KNOWN_SETTINGS=(
 
     ## Linux Options
     musl-path                                     "/usr/local/musl" "The path to the Musl headers and libraries"
-    linux-arch                                    ""                "The Linux target architecture(s)"
-    linux-static-arch                             ""                "The fully static Linux target architecture(s)"
+    linux-archs                                   ""                "The Linux target architecture(s)"
+    linux-static-archs                            ""                "The fully static Linux target architecture(s)"
 
     ## Darwin Options
     darwin-crash-reporter-client                  ""                "whether to enable CrashReporter integration, default is 1 on Darwin platforms, 0 otherwise"
@@ -1729,15 +1729,15 @@ for host in "${ALL_HOSTS[@]}"; do
                 if [[ ! "${SKIP_BUILD_LINUX}" ]]; then
                     cmake_options=(
                         "${cmake_options[@]}"
-                        -DSWIFT_SDK_LINUX_ARCHITECTURES:STRING="${LINUX_ARCH}"
+                        -DSWIFT_SDK_LINUX_ARCHITECTURES:STRING="${LINUX_ARCHS}"
                     )
                 fi
 
                 if [[ ! "${SKIP_BUILD_LINUX_STATIC}" ]]; then
                     cmake_options=(
                         "${cmake_options[@]}"
                         -DSWIFT_MUSL_PATH:STRING="${MUSL_PATH}"
-                        -DSWIFT_SDK_LINUX_STATIC_ARCHITECTURES:STRING="${LINUX_STATIC_ARCH}"
+                        -DSWIFT_SDK_LINUX_STATIC_ARCHITECTURES:STRING="${LINUX_STATIC_ARCHS}"
                     )
                 fi
 

utils/build_swift/build_swift/driver_arguments.py

@@ -1394,7 +1394,7 @@ def create_argument_parser():
     # -------------------------------------------------------------------------
     in_group('Build settings for Linux')
 
-    option('--linux-arch', store,
+    option('--linux-archs', store,
            type=argparse.ShellSplitType(),
            default=None,
            help='Semicolon-separated list of architectures to use when '
@@ -1407,7 +1407,7 @@ def create_argument_parser():
            default='/usr/local/musl',
            help='The path to the Musl headers and libraries.')
 
-    option('--linux-static-arch', store,
+    option('--linux-static-archs', store,
            type=argparse.ShellSplitType(),
            default=None,
            help='Semicolon-separated list of architectures to use when '

utils/build_swift/tests/expected_options.py

@@ -212,7 +212,7 @@
     'libdispatch_build_variant': 'Debug',
     'libicu_build_variant': 'Debug',
     'libxml2_build_variant': 'Debug',
-    'linux_arch': None,
+    'linux_archs': None,
     'lit_jobs': multiprocessing.cpu_count(),
     'zlib_build_variant': 'Debug',
     'curl_build_variant': 'Debug',
@@ -238,7 +238,7 @@
     'maccatalyst': False,
     'maccatalyst_ios_tests': False,
     'musl_path': '/usr/local/musl',
-    'linux_static_arch': None,
+    'linux_static_archs': None,
     'native_clang_tools_path': None,
     'native_llvm_tools_path': None,
     'native_swift_tools_path': None,

utils/swift_build_support/swift_build_support/build_script_invocation.py

@@ -523,13 +523,13 @@ def convert_to_impl_arguments(self):
             impl_args += [
                 "--musl-path=%s" % (args.musl_path, )
             ]
-        if args.linux_static_arch:
+        if args.linux_static_archs:
             impl_args += [
-                "--linux-static-arch=%s" % ';'.join(args.linux_static_arch)
+                "--linux-static-archs=%s" % ';'.join(args.linux_static_archs)
             ]
-        if args.linux_arch:
+        if args.linux_archs:
             impl_args += [
-                "--linux-arch=%s" % ';'.join(args.linux_arch)
+                "--linux-archs=%s" % ';'.join(args.linux_archs)
             ]
 
         # Compute the set of host-specific variables, which we pass through to