build: inline _add_swift_host_library_single

This function is used at one site and is an internal function.  Host
libraries are always built in a single configuration, just inline it to
avoid unnecessarily reparsing arguments.

Author: compnerd

cmake/modules/AddSwift.cmake

@@ -437,17 +437,16 @@ function(_add_host_variant_link_flags target)
     "${SWIFT_HOST_VARIANT_SDK}" "")
 endfunction()
 
-# Add a single variant of a new Swift library.
+# Add a new Swift host library.
 #
 # Usage:
-#   _add_swift_host_library_single(
-#     target
+#   add_swift_host_library(name
 #     [SHARED]
 #     [STATIC]
 #     [LLVM_LINK_COMPONENTS comp1 ...]
 #     source1 [source2 source3 ...])
 #
-# target
+# name
 #   Name of the library (e.g., swiftParse).
 #
 # SHARED
@@ -460,63 +459,63 @@ endfunction()
 #   LLVM components this library depends on.
 #
 # source1 ...
-#   Sources to add into this library
-function(_add_swift_host_library_single target)
+#   Sources to add into this library.
+function(add_swift_host_library name)
   set(options
         SHARED
         STATIC)
   set(single_parameter_options)
   set(multiple_parameter_options
         LLVM_LINK_COMPONENTS)
 
-  cmake_parse_arguments(ASHLS
+  cmake_parse_arguments(ASHL
                         "${options}"
                         "${single_parameter_options}"
                         "${multiple_parameter_options}"
                         ${ARGN})
-  set(ASHLS_SOURCES ${ASHLS_UNPARSED_ARGUMENTS})
+  set(ASHL_SOURCES ${ASHL_UNPARSED_ARGUMENTS})
 
-  translate_flags(ASHLS "${options}")
+  translate_flags(ASHL "${options}")
 
-  if(NOT ASHLS_SHARED AND NOT ASHLS_STATIC)
+  if(NOT ASHL_SHARED AND NOT ASHL_STATIC)
     message(FATAL_ERROR "Either SHARED or STATIC must be specified")
   endif()
 
   # Include LLVM Bitcode slices for iOS, Watch OS, and Apple TV OS device libraries.
   set(embed_bitcode_arg)
   if(SWIFT_EMBED_BITCODE_SECTION)
     if(SWIFT_HOST_VARIANT_SDK MATCHES "(I|TV|WATCH)OS")
-      list(APPEND ASHLS_C_COMPILE_FLAGS "-fembed-bitcode")
+      list(APPEND ASHL_C_COMPILE_FLAGS "-fembed-bitcode")
       set(embed_bitcode_arg EMBED_BITCODE)
     endif()
   endif()
 
   if(XCODE)
     string(REGEX MATCHALL "/[^/]+" split_path ${CMAKE_CURRENT_SOURCE_DIR})
     list(GET split_path -1 dir)
-    file(GLOB_RECURSE ASHLS_HEADERS
+    file(GLOB_RECURSE ASHL_HEADERS
       ${SWIFT_SOURCE_DIR}/include/swift${dir}/*.h
       ${SWIFT_SOURCE_DIR}/include/swift${dir}/*.def
       ${CMAKE_CURRENT_SOURCE_DIR}/*.def)
 
-    file(GLOB_RECURSE ASHLS_TDS
+    file(GLOB_RECURSE ASHL_TDS
       ${SWIFT_SOURCE_DIR}/include/swift${dir}/*.td)
 
-    set_source_files_properties(${ASHLS_HEADERS} ${ASHLS_TDS}
+    set_source_files_properties(${ASHL_HEADERS} ${ASHL_TDS}
       PROPERTIES
       HEADER_FILE_ONLY true)
-    source_group("TableGen descriptions" FILES ${ASHLS_TDS})
+    source_group("TableGen descriptions" FILES ${ASHL_TDS})
 
-    set(ASHLS_SOURCES ${ASHLS_SOURCES} ${ASHLS_HEADERS} ${ASHLS_TDS})
+    set(ASHL_SOURCES ${ASHL_SOURCES} ${ASHL_HEADERS} ${ASHL_TDS})
   endif()
 
-  if(ASHLS_SHARED)
+  if(ASHL_SHARED)
     set(libkind SHARED)
-  elseif(ASHLS_STATIC)
+  elseif(ASHL_STATIC)
     set(libkind STATIC)
   endif()
 
-  add_library("${target}" ${libkind} ${ASHLS_SOURCES})
+  add_library("${target}" ${libkind} ${ASHL_SOURCES})
   _set_target_prefix_and_suffix("${target}" "${libkind}" "${SWIFT_HOST_VARIANT_SDK}")
   add_dependencies(${target} ${LLVM_COMMON_DEPENDS})
 
@@ -560,10 +559,10 @@ function(_add_swift_host_library_single target)
   set_target_properties("${target}" PROPERTIES FOLDER "Swift libraries")
 
   # Call llvm_config() only for libraries that are part of the compiler.
-  swift_common_llvm_config("${target}" ${ASHLS_LLVM_LINK_COMPONENTS})
+  swift_common_llvm_config("${target}" ${ASHL_LLVM_LINK_COMPONENTS})
 
   target_compile_options(${target} PRIVATE
-    ${ASHLS_C_COMPILE_FLAGS})
+    ${ASHL_C_COMPILE_FLAGS})
   if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
     if(libkind STREQUAL SHARED)
       target_compile_definitions(${target} PRIVATE
@@ -582,9 +581,9 @@ function(_add_swift_host_library_single target)
       ${${SWIFT_HOST_VARIANT_ARCH}_INCLUDE})
 
     if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)
-      swift_windows_get_sdk_vfs_overlay(ASHLS_VFS_OVERLAY)
+      swift_windows_get_sdk_vfs_overlay(ASHL_VFS_OVERLAY)
       target_compile_options(${target} PRIVATE
-        "SHELL:-Xclang -ivfsoverlay -Xclang ${ASHLS_VFS_OVERLAY}")
+        "SHELL:-Xclang -ivfsoverlay -Xclang ${ASHL_VFS_OVERLAY}")
 
       # MSVC doesn't support -Xclang. We don't need to manually specify
       # the dependent libraries as `cl` does so.
@@ -622,61 +621,6 @@ function(_add_swift_host_library_single target)
     endif()
   endif()
 
-  # Do not add code here.
-endfunction()
-
-# Add a new Swift host library.
-#
-# Usage:
-#   add_swift_host_library(name
-#     [SHARED]
-#     [STATIC]
-#     [LLVM_LINK_COMPONENTS comp1 ...]
-#     source1 [source2 source3 ...])
-#
-# name
-#   Name of the library (e.g., swiftParse).
-#
-# SHARED
-#   Build a shared library.
-#
-# STATIC
-#   Build a static library.
-#
-# LLVM_LINK_COMPONENTS
-#   LLVM components this library depends on.
-#
-# source1 ...
-#   Sources to add into this library.
-function(add_swift_host_library name)
-  set(options
-        SHARED
-        STATIC)
-  set(single_parameter_options)
-  set(multiple_parameter_options
-        LLVM_LINK_COMPONENTS)
-
-  cmake_parse_arguments(ASHL
-                        "${options}"
-                        "${single_parameter_options}"
-                        "${multiple_parameter_options}"
-                        ${ARGN})
-  set(ASHL_SOURCES ${ASHL_UNPARSED_ARGUMENTS})
-
-  translate_flags(ASHL "${options}")
-
-  if(NOT ASHL_SHARED AND NOT ASHL_STATIC)
-    message(FATAL_ERROR "Either SHARED or STATIC must be specified")
-  endif()
-
-  _add_swift_host_library_single(
-    ${name}
-    ${ASHL_SHARED_keyword}
-    ${ASHL_STATIC_keyword}
-    ${ASHL_SOURCES}
-    LLVM_LINK_COMPONENTS ${ASHL_LLVM_LINK_COMPONENTS}
-    )
-
   add_dependencies(dev ${name})
   if(NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     swift_install_in_component(TARGETS ${name}