Merge pull request swiftlang#22375 from apple/revert-22359-revert-22346-libcxx

Reapply "[build-script] Add Product for libc++"

Author: benlangmuir

utils/build-presets.ini

@@ -730,6 +730,7 @@ install-libicu
 install-prefix=/usr
 swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;license;sourcekit-inproc
 llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
+install-libcxx
 build-swift-static-stdlib
 build-swift-static-sdk-overlay
 build-swift-stdlib-unittest-extra
@@ -1082,6 +1083,7 @@ reconfigure
 
 swift-install-components=compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
 llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
+install-libcxx
 
 # Path to the .tar.gz package we would create.
 installable-package=%(installable_package)s

utils/build-script

@@ -841,6 +841,7 @@ class BuildScriptInvocation(object):
         product_classes = []
         product_classes.append(products.CMark)
         product_classes.append(products.LLVM)
+        product_classes.append(products.LibCXX)
         if self.args.build_libicu:
             product_classes.append(products.LibICU)
         product_classes.append(products.Swift)

utils/build-script-impl

@@ -208,6 +208,7 @@ KNOWN_SETTINGS=(
     install-swiftevolve         ""               "whether to install the swift-evolve tool"
     install-xctest              ""               "whether to install xctest"
     install-foundation          ""               "whether to install foundation"
+    install-libcxx              ""               "whether to install libc++"
     install-libdispatch         ""               "whether to install libdispatch"
     install-libicu              ""               "whether to install libicu"
     install-playgroundsupport   ""               "whether to install PlaygroundSupport"
@@ -3496,6 +3497,9 @@ for host in "${ALL_HOSTS[@]}"; do
                 INSTALL_TARGETS=install-$(echo ${LLVM_INSTALL_COMPONENTS} | sed -E 's/;/ install-/g')
                 ;;
             libcxx)
+                if [[ -z "${INSTALL_LIBCXX}" ]] ; then
+                    continue
+                fi
                 INSTALL_TARGETS=install-cxx-headers
                 ;;
             swift)

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -12,6 +12,7 @@
 
 from .cmark import CMark
 from .foundation import Foundation
+from .libcxx import LibCXX
 from .libdispatch import LibDispatch
 from .libicu import LibICU
 from .llbuild import LLBuild
@@ -28,6 +29,7 @@
     'CMark',
     'Ninja',
     'Foundation',
+    'LibCXX',
     'LibDispatch',
     'LibICU',
     'LLBuild',

utils/swift_build_support/swift_build_support/products/libcxx.py

@@ -0,0 +1,17 @@
+# swift_build_support/products/libcxx.py -------------------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2017 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
+#
+# ----------------------------------------------------------------------------
+
+from . import product
+
+
+class LibCXX(product.Product):
+    pass