Merge pull request #21721 from benlangmuir/optionalize

[cmake] Make install of stdlib target libraries OPTIONAL

Author: benlangmuir

cmake/modules/AddSwift.cmake

@@ -1968,6 +1968,12 @@ function(add_swift_target_library name)
             WORLD_READ)
       endif()
 
+      set(optional_arg)
+      if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
+        # Allow installation of stdlib without building all variants on Darwin.
+        set(optional_arg "OPTIONAL")
+      endif()
+
       if(sdk STREQUAL WINDOWS AND CMAKE_SYSTEM_NAME STREQUAL Windows)
         swift_install_in_component("${SWIFTLIB_INSTALL_IN_COMPONENT}"
           TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}
@@ -1979,7 +1985,8 @@ function(add_swift_target_library name)
         swift_install_in_component("${SWIFTLIB_INSTALL_IN_COMPONENT}"
             FILES "${UNIVERSAL_LIBRARY_NAME}"
             DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}"
-            PERMISSIONS ${file_permissions})
+            PERMISSIONS ${file_permissions}
+            "${optional_arg}")
       endif()
       if(sdk STREQUAL WINDOWS)
         foreach(arch ${SWIFT_SDK_WINDOWS_ARCHITECTURES})
@@ -2026,7 +2033,8 @@ function(add_swift_target_library name)
             PERMISSIONS
               OWNER_READ OWNER_WRITE
               GROUP_READ
-              WORLD_READ)
+              WORLD_READ
+            "${optional_arg}")
       endif()
 
       # Add Swift standard library targets as dependencies to the top-level

cmake/modules/SwiftSource.cmake

@@ -347,9 +347,16 @@ function(_compile_swift_files
     list(APPEND module_outputs "${interface_file}")
   endif()
 
+  set(optional_arg)
+  if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
+    # Allow installation of stdlib without building all variants on Darwin.
+    set(optional_arg "OPTIONAL")
+  endif()
+
   swift_install_in_component("${SWIFTFILE_INSTALL_IN_COMPONENT}"
     FILES ${module_outputs}
-    DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${library_subdir}")
+    DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${library_subdir}"
+    "${optional_arg}")
 
   set(line_directive_tool "${SWIFT_SOURCE_DIR}/utils/line-directive")
   set(swift_compiler_tool "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc")