[5.9 cherry-pick of #64492]Add MinimalStdlib build-script product, build is in main CI jobs and PR testing jobs

utils/build-presets.ini

@@ -1607,6 +1607,8 @@ swiftsyntax
 swiftformat
 swiftdocc
 
+build-minimal-stdlib
+
 # Don't generate the SwiftSyntax gyb files. Instead verify that up-to-date ones
 # are checked in.
 swiftsyntax-verify-generated-files

utils/build_swift/build_swift/defaults.py

@@ -119,7 +119,7 @@ def llvm_install_components():
     platforms.
     """
     components = ['llvm-ar', 'llvm-cov', 'llvm-profdata', 'IndexStore', 'clang',
-                  'clang-resource-headers', 'compiler-rt', 'clangd']
+                  'clang-resource-headers', 'compiler-rt', 'clangd', 'LTO']
     if os.sys.platform == 'darwin':
         components.extend(['dsymutil'])
     else:

utils/build_swift/build_swift/driver_arguments.py

@@ -739,6 +739,9 @@ def create_argument_parser():
            toggle_true('build_swift_inspect'),
            help='build SwiftInspect using swiftpm against the just built '
                 'toolchain')
+    option(['--build-minimal-stdlib'], toggle_true('build_minimalstdlib'),
+           help='build the \'minimal\' freestanding stdlib variant into a '
+                'separate build directory ')
 
     option('--xctest', toggle_true('build_xctest'),
            help='build xctest')

utils/build_swift/tests/expected_options.py

@@ -100,6 +100,7 @@
     'build_swiftformat': False,
     'build_swiftevolve': False,
     'build_swiftdocc': False,
+    'build_minimalstdlib': False,
     'build_indexstoredb': False,
     'test_indexstoredb_sanitize_all': False,
     'test_sourcekitlsp_sanitize_all': False,
@@ -539,6 +540,7 @@ class BuildScriptImplOption(_BaseOption):
     SetTrueOption('--swiftformat', dest='build_swiftformat'),
     SetTrueOption('--swiftevolve', dest='build_swiftevolve'),
     SetTrueOption('--swiftdocc', dest='build_swiftdocc'),
+    SetTrueOption('--build-minimal-stdlib', dest='build_minimalstdlib'),
     SetTrueOption('-B', dest='benchmark'),
     SetTrueOption('-S', dest='skip_build'),
     SetTrueOption('-b', dest='build_llbuild'),

utils/swift_build_support/swift_build_support/build_script_invocation.py

@@ -654,6 +654,8 @@ def compute_product_pipelines(self):
                             is_enabled=self.args.build_swiftdocc)
         builder.add_product(products.SwiftDocCRender,
                             is_enabled=self.args.install_swiftdocc)
+        builder.add_product(products.MinimalStdlib,
+                            is_enabled=self.args.build_minimalstdlib)
 
         # Keep SwiftDriver at last.
         # swift-driver's integration with the build scripts is not fully

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -25,6 +25,7 @@
 from .llbuild import LLBuild
 from .lldb import LLDB
 from .llvm import LLVM
+from .minimalstdlib import MinimalStdlib
 from .ninja import Ninja
 from .playgroundsupport import PlaygroundSupport
 from .skstresstester import SKStressTester
@@ -45,7 +46,6 @@
 __all__ = [
     'BackDeployConcurrency',
     'CMark',
-    'Ninja',
     'Foundation',
     'LibCXX',
     'LibDispatch',
@@ -56,6 +56,7 @@
     'LLBuild',
     'LLDB',
     'LLVM',
+    'MinimalStdlib',
     'Ninja',
     'PlaygroundSupport',
     'Swift',

utils/swift_build_support/swift_build_support/products/minimalstdlib.py

@@ -0,0 +1,186 @@
+# swift_build_support/products/minimalstdlib.py -----------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ----------------------------------------------------------------------------
+
+import os
+import platform
+
+from . import cmake_product
+from . import cmark
+from . import libcxx
+from . import llvm
+from . import swift
+
+
+class MinimalStdlib(cmake_product.CMakeProduct):
+    @classmethod
+    def product_source_name(cls):
+        return os.path.join("swift")
+
+    @classmethod
+    def is_build_script_impl_product(cls):
+        return False
+
+    @classmethod
+    def is_before_build_script_impl_product(cls):
+        return False
+
+    def should_build(self, host_target):
+        return platform.system() == 'Darwin'
+
+    def build(self, host_target):
+        build_variant = 'MinSizeRel'
+        self.cmake_options.define('CMAKE_BUILD_TYPE:STRING', build_variant)
+        self.cmake_options.define(
+            'SWIFT_STDLIB_BUILD_TYPE:STRING', build_variant)
+
+        build_root = os.path.dirname(self.build_dir)
+        llvm_build_dir = os.path.join(
+            '..', build_root, '%s-%s' % ('llvm', host_target))
+        llvm_cmake_dir = os.path.join(llvm_build_dir, 'lib', 'cmake', 'llvm')
+        self.cmake_options.define('LLVM_DIR:PATH', llvm_cmake_dir)
+
+        # Use the just-built toolchain
+        toolchain_dir = self.install_toolchain_path(host_target)
+        self.cmake_options.define('TOOLCHAIN_DIR:PATH', toolchain_dir)
+        self.cmake_options.define(
+            'SWIFT_NATIVE_CLANG_TOOLS_PATH:STRING', toolchain_dir + '/bin')
+        self.cmake_options.define(
+            'SWIFT_NATIVE_LLVM_TOOLS_PATH:STRING', toolchain_dir + '/bin')
+        self.cmake_options.define(
+            'SWIFT_NATIVE_SWIFT_TOOLS_PATH:STRING', toolchain_dir + '/bin')
+
+        # Build the freestanding variant, with these options
+        self.cmake_options.define('SWIFT_SDKS:STRING', 'FREESTANDING')
+        self.cmake_options.define(
+            'SWIFT_FREESTANDING_ARCHS:STRING', 'x86_64;arm64')
+        self.cmake_options.define('SWIFT_FREESTANDING_FLAVOR:STRING', 'apple')
+        self.cmake_options.define('SWIFT_FREESTANDING_IS_DARWIN:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_FREESTANDING_MODULE_NAME:STRING', 'macos')
+        self.cmake_options.define('SWIFT_FREESTANDING_SDK:STRING', 'macosx')
+        self.cmake_options.define(
+            'SWIFT_FREESTANDING_TRIPLE_NAME:STRING', 'macosx11.0')
+        self.cmake_options.define(
+            'SWIFT_PRIMARY_VARIANT_ARCH:STRING', 'x86_64')
+        self.cmake_options.define(
+            'SWIFT_PRIMARY_VARIANT_SDK:STRING', 'FREESTANDING')
+        self.cmake_options.define(
+            'SWIFT_HOST_TRIPLE:STRING', 'x86_64-apple-macosx10.13')
+        self.cmake_options.define('SWIFT_HOST_VARIANT', 'macosx')
+        self.cmake_options.define('SWIFT_HOST_VARIANT_ARCH', 'x86_64')
+        self.cmake_options.define('SWIFT_HOST_VARIANT_SDK', 'OSX')
+        self.cmake_options.define('SWIFT_STDLIB_ASSERTIONS:BOOL', 'FALSE')
+
+        # Configure build to only build the stdlib, and only a static version of it
+        self.cmake_options.define(
+            'SWIFT_BUILD_DYNAMIC_SDK_OVERLAY:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_BUILD_DYNAMIC_STDLIB:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_BUILD_REMOTE_MIRROR:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_BUILD_STATIC_STDLIB:BOOL', 'TRUE')
+        self.cmake_options.define('SWIFT_INCLUDE_TESTS:BOOL', 'TRUE')
+        self.cmake_options.define('SWIFT_INCLUDE_TOOLS:BOOL', 'FALSE')
+
+        # Stdlib feature flags
+        self.cmake_options.define('SWIFT_ENABLE_BACKTRACING:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_ENABLE_DISPATCH:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL', 'TRUE')
+        self.cmake_options.define(
+            'SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_ENABLE_REFLECTION:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_IMPLICIT_CONCURRENCY_IMPORT:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_RUNTIME_CRASH_REPORTER_CLIENT:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_RUNTIME_ENABLE_LEAK_CHECKER:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_RUNTIME_STATIC_IMAGE_INSPECTION:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_BUILD_PRIVATE:BOOL', 'TRUE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_CONCURRENCY_TRACING:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_DISABLE_INSTANTIATION_CACHES:BOOL', 'TRUE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_ENABLE_DEBUG_PRECONDITIONS_IN_RELEASE', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_ENABLE_LTO:STRING', 'full')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_ENABLE_OBJC_INTEROP:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_ENABLE_PRESPECIALIZATION:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_ENABLE_STDLIBCORE_EXCLUSIVITY_CHECKING:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_ENABLE_UNICODE_DATA', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_ENABLE_VECTOR_TYPES:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_EXPERIMENTAL_HERMETIC_SEAL_AT_LINK:BOOL', 'TRUE')
+        self.cmake_options.define('SWIFT_STDLIB_HAS_ASL:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_HAS_COMMANDLINE:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_HAS_DARWIN_LIBMALLOC:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_HAS_DLADDR:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_HAS_ENVIRON:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_HAS_LOCALE:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_HAS_STDIN:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_HAS_TYPE_PRINTING:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_OS_VERSIONING:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_PASSTHROUGH_METADATA_ALLOCATOR:BOOL', 'TRUE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_REFLECTION_METADATA:STRING', 'debugger-only')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_SHORT_MANGLING_LOOKUPS:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_SIL_DEBUGGING:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_SINGLE_THREADED_CONCURRENCY:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_STABLE_ABI:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_STATIC_PRINT', 'TRUE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_SUPPORTS_BACKTRACE_REPORTING:BOOL', 'FALSE')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT:BOOL', 'FALSE')
+        self.cmake_options.define('SWIFT_STDLIB_TRAP_FUNCTION:STRING', '')
+        self.cmake_options.define(
+            'SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES:BOOL', 'TRUE')
+        self.cmake_options.define('SWIFT_THREADING_PACKAGE:STRING', 'none')
+
+        # Build!
+        self.build_with_cmake(["swift-stdlib-freestanding"], build_variant, [],
+                              prefer_just_built_toolchain=True)
+
+    def should_test(self, host_target):
+        return False
+
+    def test(self, host_target):
+        raise RuntimeError("Testing not implemented")
+
+    def should_install(self, host_target):
+        return False
+
+    @classmethod
+    def get_dependencies(cls):
+        return [cmark.CMark,
+                llvm.LLVM,
+                libcxx.LibCXX,
+                swift.Swift]