Merge pull request swiftlang#80725 from kubamracek/embedded-concurrency-for-non-darwin

[embedded] Start building Concurrency.swiftmodule/.a for non-Darwin target triples too

Author: kubamracek

stdlib/public/Concurrency/CMakeLists.txt

@@ -272,31 +272,23 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
     list(GET list 1 mod)
     list(GET list 2 triple)
 
+    set(extra_c_compile_flags)
+    set(extra_swift_compile_flags)
+
     if (SWIFT_HOST_VARIANT STREQUAL "linux")
       if(NOT "${mod}" MATCHES "-linux-gnu$")
         continue()
       endif()
-      set(extra_c_compile_flags)
-      set(extra_swift_compile_flags)
     elseif (SWIFT_HOST_VARIANT STREQUAL "macosx")
-      if(NOT "${mod}" MATCHES "-macos$")
-        continue()
-      endif()
-      if("${mod}" MATCHES "riscv")
-        continue()
-      endif()
-      if("${mod}" MATCHES "armv6m")
+      if(NOT "${mod}" MATCHES "x86_64|arm64|arm64e|armv7|armv7m|armv7em")
         continue()
       endif()
 
-      if("${mod}" MATCHES "-macos$")
-        set(extra_c_compile_flags -ffreestanding -stdlib=libc++)
-        set(extra_swift_compile_flags -Xcc -ffreestanding)
+      if(NOT "${mod}" MATCHES "-apple-" OR "${mod}" MATCHES "-none-macho")
+        # Host is macOS with a macOS SDK. To be able to build the C++ Concurrency runtime for non-Darwin targets using the macOS SDK,
+        # we need to pass some extra flags and search paths.
+        set(extra_c_compile_flags -stdlib=libc++ -isystem${SWIFT_SDK_OSX_PATH}/usr/include/c++/v1 -isystem${SWIFT_SDK_OSX_PATH}/usr/include -D__APPLE__)
       endif()
-
-    elseif (SWIFT_HOST_VARIANT STREQUAL "wasi")
-      set(extra_c_compile_flags)
-      set(extra_swift_compile_flags)
     endif()
 
     set(SWIFT_SDK_embedded_THREADING_PACKAGE none)