[Embedded][Concurrency] Workaround for Gyb+concurrency module+embedded

Author: ktoso

cmake/modules/SwiftSetIfArchBitness.cmake

@@ -6,39 +6,45 @@ function(set_if_arch_bitness var_name)
       "" # multi-value args
       ${ARGN})
 
-  if("${SIA_ARCH}" STREQUAL "avr")
+  # FIXME: This is a workaround for Concurrency/CMakeLists.txt setting the GYB_SOURCES in embedded-concurrency
+  #        Need to figure out why the SIA_ARCH we get from there isn't right, and undo this workaround.
+  # Extract first part of the SIA_ARCH (e.g., "x86_64" from "x86_64-apple-macos")
+  string(REPLACE "-" ";" SIA_ARCH_LIST "${SIA_ARCH}")
+  list(GET SIA_ARCH_LIST 0 SIA_ARCH_HEAD)
+
+  if("${SIA_ARCH_HEAD}" STREQUAL "avr")
       set("${var_name}" "${SIA_CASE_16_BIT}" PARENT_SCOPE)
-  elseif("${SIA_ARCH}" STREQUAL "i386" OR
-     "${SIA_ARCH}" STREQUAL "i686" OR
-     "${SIA_ARCH}" STREQUAL "x86" OR
-     "${SIA_ARCH}" STREQUAL "armv4t" OR
-     "${SIA_ARCH}" STREQUAL "armv5" OR
-     "${SIA_ARCH}" STREQUAL "armv6" OR
-     "${SIA_ARCH}" STREQUAL "armv6m" OR
-     "${SIA_ARCH}" STREQUAL "armv7" OR
-     "${SIA_ARCH}" STREQUAL "armv7k" OR
-     "${SIA_ARCH}" STREQUAL "arm64_32" OR
-     "${SIA_ARCH}" STREQUAL "armv7m" OR
-     "${SIA_ARCH}" STREQUAL "armv7em" OR
-     "${SIA_ARCH}" STREQUAL "armv7s" OR
-     "${SIA_ARCH}" STREQUAL "m68k" OR
-     "${SIA_ARCH}" STREQUAL "riscv32" OR
-     "${SIA_ARCH}" STREQUAL "wasm32" OR
-     "${SIA_ARCH}" STREQUAL "powerpc")
+  elseif("${SIA_ARCH_HEAD}" STREQUAL "i386" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "i686" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "x86" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv4t" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv5" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv6" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv6m" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv7" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv7k" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "arm64_32" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv7m" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv7em" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "armv7s" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "m68k" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "riscv32" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "wasm32" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "powerpc")
     set("${var_name}" "${SIA_CASE_32_BIT}" PARENT_SCOPE)
-  elseif("${SIA_ARCH}" STREQUAL "x86_64" OR
-         "${SIA_ARCH}" STREQUAL "amd64" OR
-         "${SIA_ARCH}" STREQUAL "arm64" OR
-         "${SIA_ARCH}" STREQUAL "arm64e" OR
-         "${SIA_ARCH}" STREQUAL "aarch64" OR
-         "${SIA_ARCH}" STREQUAL "powerpc64" OR
-         "${SIA_ARCH}" STREQUAL "powerpc64le" OR
-         "${SIA_ARCH}" STREQUAL "s390x" OR
-         "${SIA_ARCH}" STREQUAL "riscv64" OR
-         "${SIA_ARCH}" STREQUAL "wasm64")
+  elseif("${SIA_ARCH_HEAD}" STREQUAL "x86_64" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "amd64" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "arm64" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "arm64e" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "aarch64" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "powerpc64" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "powerpc64le" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "s390x" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "riscv64" OR
+     "${SIA_ARCH_HEAD}" STREQUAL "wasm64")
     set("${var_name}" "${SIA_CASE_64_BIT}" PARENT_SCOPE)
   else()
-    message(FATAL_ERROR "Unknown architecture: ${SIA_ARCH}")
+    message(FATAL_ERROR "Unknown architecture: ${SIA_ARCH_HEAD} (prefix of ${SIA})")
   endif()
 endfunction()