Merge pull request #77468 from etcwilde/ewilde/stdlib-rebuild-commandline-support

[CMake] Adding C/C++ portion of CommandLine support

Author: etcwilde

Runtimes/Core/CMakeLists.txt

@@ -90,4 +90,5 @@ add_subdirectory(Demangling)
 add_subdirectory(Threading)
 add_subdirectory(runtime)
 add_subdirectory(stubs)
+add_subdirectory(CommandLineSupport)
 add_subdirectory(core)

Runtimes/Core/CommandLineSupport/CMakeLists.txt

@@ -0,0 +1,13 @@
+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_link_libraries(swiftCommandLineSupport PRIVATE
+    swiftShims)
+
+  if(NOT BUILD_SHARED_LIBS)
+    install(TARGETS swiftCommandLineSupport)
+  endif()
+endif()

Runtimes/Core/core/CMakeLists.txt

@@ -241,9 +241,9 @@ add_library(swiftCore
 
 set_target_properties(swiftCore PROPERTIES Swift_MODULE_NAME Swift)
 
-if(SwiftCore_ENABLE_COMMANDLINE)
-  # TODO: Pull in the CommandLine C++ files too
+if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
   target_sources(swiftCore PRIVATE CommandLine.swift)
+  target_link_libraries(swiftCore PRIVATE swiftCommandLineSupport)
 endif()
 
 if(SwiftCore_ENABLE_VECTOR_TYPES)

Runtimes/Resync.cmake

@@ -65,6 +65,7 @@ set(CoreLibs
   runtime
   CompatibilityOverride
   stubs
+  CommandLineSupport
   core)
 
   # Add these as we get them building