[Mac build] Add macros build

Author: Steelskin

.github/workflows/build-toolchain.yml

@@ -373,29 +373,33 @@ jobs:
                   "arch": "amd64",
                   "cpu": "x86_64",
                   "triple": "x86_64-unknown-windows-msvc",
-                  "compiler_target": "x86_64-unknown-windows-msvc",
                   "os": "Windows",
+                  "platform": "Windows",
                   "cc": "cl",
                   "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
                   "cxx": "cl",
                   "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
                   "swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
                   "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
+                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64",
+                  "host_built_swiftc": "${HostToolchain}/usr/bin/swiftc.exe",
+                  "macros_swiftflags": "-strict-implicit-module-context -resource-dir ${SDKRoot}/usr/lib/swift -L${SDKRoot}/usr/lib/swift/windows -vfsoverlay ${WINDOWS_VFS_OVERLAY} -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
                 },
                 {
                   "arch": "arm64",
                   "cpu": "aarch64",
                   "triple": "aarch64-unknown-windows-msvc",
-                  "compiler_target": "aarch64-unknown-windows-msvc",
                   "os": "Windows",
+                  "platform": "Windows",
                   "cc": "cl",
                   "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
                   "cxx": "cl",
                   "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
                   "swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
                   "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
+                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64",
+                  "host_built_swiftc": "${HostToolchain}/usr/bin/swiftc.exe",
+                  "macros_swiftflags": "-strict-implicit-module-context -resource-dir ${SDKRoot}/usr/lib/swift -L${SDKRoot}/usr/lib/swift/windows -vfsoverlay ${WINDOWS_VFS_OVERLAY} -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
                 }
               ]
             }
@@ -406,7 +410,6 @@ jobs:
                   "arch": "arm64",
                   "cpu": "aarch64",
                   "triple": "aarch64-unknown-windows-msvc",
-                  "compiler_target": "aarch64-unknown-windows-msvc",
                   "os": "Windows",
                   "cc": "cl",
                   "cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
@@ -697,25 +700,35 @@ jobs:
               "include": [
                 {
                   "arch": "x86_64",
+                  "cpu": "x86_64",
+                  "triple": "x86_64-apple-macosx15.0",
                   "os": "Darwin",
+                  "platform": "MacOSX",
                   "cc": "clang",
                   "cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
                   "cxx": "clang++",
                   "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
                   "swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
                   "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.DARWIN_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.DARWIN_CMAKE_SHARED_LINKER_FLAGS }}\"",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=x86_64"
+                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=x86_64",
+                  "host_built_swiftc": "${HostToolchain}/usr/bin/swiftc",
+                  "macros_swiftflags": ""
                 },
                 {
                   "arch": "arm64",
+                  "cpu": "aarch64",
+                  "triple": "aarch64-apple-macosx15.0",
                   "os": "Darwin",
+                  "platform": "MacOSX",
                   "cc": "clang",
                   "cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
                   "cxx": "clang++",
                   "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
                   "swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
                   "cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=${{ steps.context.outputs.DARWIN_CMAKE_EXE_LINKER_FLAGS }} -D CMAKE_SHARED_LINKER_FLAGS=${{ steps.context.outputs.DARWIN_CMAKE_SHARED_LINKER_FLAGS }}",
-                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64"
+                  "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64",
+                  "host_built_swiftc": "${HostToolchain}/usr/bin/swiftc",
+                  "macros_swiftflags": ""
                 }
               ]
             }