Merge pull request swiftlang#81597 from compnerd/objectification

Runtimes: mark CommandLineSupporta as an OBJECT library

Author: compnerd

Runtimes/Core/CMakeLists.txt

@@ -209,8 +209,10 @@ add_subdirectory(Demangling)
 add_subdirectory(Threading)
 add_subdirectory(runtime)
 add_subdirectory(stubs)
-add_subdirectory(CommandLineSupport)
 add_subdirectory(core)
+if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
+  add_subdirectory(CommandLineSupport)
+endif()
 if(SwiftCore_ENABLE_ONONESUPPORT)
   add_subdirectory(SwiftOnoneSupport)
 endif()

Runtimes/Core/CommandLineSupport/CMakeLists.txt

@@ -1,19 +1,9 @@
-if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
-  add_library(swiftCommandLineSupport STATIC CommandLine.cpp)
-  target_include_directories(swiftCommandLineSupport PRIVATE
-    "${SwiftCore_SWIFTC_SOURCE_DIR}/include"
-    "${PROJECT_BINARY_DIR}/include")
-  target_compile_definitions(swiftCommandLineSupport PUBLIC
-    -DSWIFT_STDLIB_HAS_COMMANDLINE)
-  target_compile_definitions(swiftCommandLineSupport PRIVATE
-    $<$<BOOL:${BUILD_SHARED_LIBS}>:-DswiftCore_EXPORTS>)
-
-  target_link_libraries(swiftCommandLineSupport PRIVATE
-    swiftShims)
-
-  if(NOT BUILD_SHARED_LIBS)
-    install(TARGETS swiftCommandLineSupport
-      EXPORT SwiftCoreTargets
-      COMPONENT SwiftCore_runtime)
-  endif()
-endif()
+# TODO(etcwilde) migrate this into subdir subdirectory once the migration is
+# completed.
+target_sources(swiftCore PRIVATE
+  CommandLine.cpp)
+target_compile_definitions(swiftCore PUBLIC
+  -DSWIFT_STDLIB_HAS_COMMANDLINE)
+target_include_directories(swiftCore PRIVATE
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/include"
+  "${PROJECT_BINARY_DIR}/include")

Runtimes/Core/core/CMakeLists.txt

@@ -259,8 +259,8 @@ if(NOT LINUX AND NOT ANDROID)
 endif()
 
 if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
-  target_sources(swiftCore PRIVATE CommandLine.swift)
-  target_link_libraries(swiftCore PRIVATE swiftCommandLineSupport)
+  target_sources(swiftCore PRIVATE
+    CommandLine.swift)
 endif()
 
 if(SwiftCore_ENABLE_VECTOR_TYPES)