Merge pull request #74536 from kubamracek/embedded-windows1

[embedded] Start building embedded stdlib on Windows

Author: kubamracek

stdlib/public/CMakeLists.txt

@@ -152,17 +152,8 @@ option(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING
       "Enable build of the embedded Swift standard library and runtime for cross-compiling targets"
       FALSE)
 
-# Temporarily, by default only build embedded stdlib when building the compiler, to
-# unblock CI jobs that run against old(er) toolchains.
-option(SWIFT_ALLOW_BUILD_EMBEDDED_STDLIB_WITH_HOST_COMPILER
-       "Build embedded Swift standard library and runtime even
-       if we are not building our own compiler"
-       FALSE)
-
-if((NOT SWIFT_HOST_VARIANT STREQUAL "macosx") AND (NOT SWIFT_HOST_VARIANT STREQUAL "linux"))
+if((NOT SWIFT_HOST_VARIANT STREQUAL "macosx") AND (NOT SWIFT_HOST_VARIANT STREQUAL "linux") AND (NOT SWIFT_HOST_VARIANT STREQUAL "windows"))
   set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
-elseif(NOT SWIFT_INCLUDE_TOOLS)
-  set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB ${SWIFT_ALLOW_BUILD_EMBEDDED_STDLIB_WITH_HOST_COMPILER})
 elseif(BOOTSTRAPPING_MODE STREQUAL "OFF")
   set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
 endif()
@@ -214,10 +205,6 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING)
     list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
       "i686    i686-unknown-none-elf       i686-unknown-none-elf"
       "x86_64  x86_64-unknown-none-elf     x86_64-unknown-none-elf"
-      # Without specifying the `windows` component LLVM refuses to
-      # generate valid COFF object files.
-      "i686    i686-unknown-windows-msvc   i686-unknown-windows-msvc"
-      "x86_64  x86_64-unknown-windows-msvc x86_64-unknown-windows-msvc"
     )
   endif()
 
@@ -231,21 +218,40 @@ endif()
 
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
   if (SWIFT_HOST_VARIANT STREQUAL "linux")
-    set(EMBEDDED_STDLIB_TARGET_TRIPLES ${EMBEDDED_STDLIB_TARGET_TRIPLES}
+    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
       "${SWIFT_HOST_VARIANT_ARCH} ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu"
       # In practice this expands to either:
       # "x86_64   x86_64-unknown-linux-gnu  x86_64-unknown-linux-gnu"
       # "aarch64  aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu"
-      )
+    )
   elseif (SWIFT_HOST_VARIANT STREQUAL "macosx")
-    set(EMBEDDED_STDLIB_TARGET_TRIPLES ${EMBEDDED_STDLIB_TARGET_TRIPLES}
+    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
       "x86_64   x86_64-apple-macos        x86_64-apple-macos14"
       "arm64    arm64-apple-macos         arm64-apple-macos14"
       "arm64e   arm64e-apple-macos        arm64e-apple-macos14"
-      )
+    )
+  elseif (SWIFT_HOST_VARIANT STREQUAL "windows")
+    list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
+      # Without specifying the `windows` component LLVM refuses to
+      # generate valid COFF object files.
+      "i686    i686-unknown-windows-msvc   i686-unknown-windows-msvc"
+      "x86_64  x86_64-unknown-windows-msvc x86_64-unknown-windows-msvc"
+    )
   endif()
 endif()
 
+if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
+  set(triples)
+  foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
+    string(REGEX REPLACE "[ \t]+" ";" list "${entry}")
+    list(GET list 2 triple)
+    list(APPEND triples ${triple})
+  endforeach()
+
+  message(STATUS "Building Embedded Swift standard libraries for targets: ${triples}")
+  message(STATUS "")
+endif()
+
 if(SWIFT_BUILD_STDLIB)
   # These must be kept in dependency order so that any referenced targets
   # exist at the time we look for them in add_swift_*.

stdlib/public/Concurrency/CMakeLists.txt

@@ -184,6 +184,8 @@ if(NOT swift_optimized)
   set(SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY FALSE)
 elseif(BOOTSTRAPPING_MODE STREQUAL "OFF")
   set(SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY FALSE)
+elseif(SWIFT_HOST_VARIANT STREQUAL "windows") # For now, don't build embedded Concurrency on Windows
+  set(SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY FALSE)
 endif()
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENCY)
   add_custom_target(embedded-concurrency)