Merge pull request #67743 from compnerd/hacks-r-us

Enable CxxStdlib on Windows

Author: compnerd

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -1080,6 +1080,10 @@ function(add_swift_target_library_single target name)
       target_include_directories("${target}" SYSTEM PRIVATE
         ${SWIFTLIB_INCLUDE})
     endif()
+    if(libkind STREQUAL STATIC)
+      set_property(TARGET "${target}" PROPERTY
+        PREFIX lib)
+    endif()
   endif()
 
   if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "WINDOWS" AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")

stdlib/public/Cxx/std/CMakeLists.txt

@@ -31,7 +31,7 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
     ${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}
 
     LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-    TARGET_SDKS ALL_APPLE_PLATFORMS LINUX
+    TARGET_SDKS ALL_APPLE_PLATFORMS LINUX WINDOWS
     INSTALL_IN_COMPONENT compiler
     INSTALL_WITH_SHARED
     DEPENDS libstdcxx-modulemap libcxxshim_modulemap)