@@ -373,29 +373,33 @@ jobs:
373
373
"arch": "amd64",
374
374
"cpu": "x86_64",
375
375
"triple": "x86_64-unknown-windows-msvc",
376
- "compiler_target": "x86_64-unknown-windows-msvc",
377
376
"os": "Windows",
377
+ "platform": "Windows",
378
378
"cc": "cl",
379
379
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
380
380
"cxx": "cl",
381
381
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
382
382
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
383
383
"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 }}\"",
384
- "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
384
+ "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64",
385
+ "host_built_swiftc": "${HostToolchain}/usr/bin/swiftc.exe",
386
+ "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"
385
387
},
386
388
{
387
389
"arch": "arm64",
388
390
"cpu": "aarch64",
389
391
"triple": "aarch64-unknown-windows-msvc",
390
- "compiler_target": "aarch64-unknown-windows-msvc",
391
392
"os": "Windows",
393
+ "platform": "Windows",
392
394
"cc": "cl",
393
395
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
394
396
"cxx": "cl",
395
397
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
396
398
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
397
399
"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 }}\"",
398
- "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
400
+ "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64",
401
+ "host_built_swiftc": "${HostToolchain}/usr/bin/swiftc.exe",
402
+ "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"
399
403
}
400
404
]
401
405
}
@@ -406,7 +410,6 @@ jobs:
406
410
"arch": "arm64",
407
411
"cpu": "aarch64",
408
412
"triple": "aarch64-unknown-windows-msvc",
409
- "compiler_target": "aarch64-unknown-windows-msvc",
410
413
"os": "Windows",
411
414
"cc": "cl",
412
415
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
@@ -697,25 +700,35 @@ jobs:
697
700
"include": [
698
701
{
699
702
"arch": "x86_64",
703
+ "cpu": "x86_64",
704
+ "triple": "x86_64-apple-macosx15.0",
700
705
"os": "Darwin",
706
+ "platform": "MacOSX",
701
707
"cc": "clang",
702
708
"cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
703
709
"cxx": "clang++",
704
710
"cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
705
711
"swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
706
712
"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 }}\"",
707
- "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=x86_64"
713
+ "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=x86_64",
714
+ "host_built_swiftc": "${HostToolchain}/usr/bin/swiftc",
715
+ "macros_swiftflags": ""
708
716
},
709
717
{
710
718
"arch": "arm64",
719
+ "cpu": "aarch64",
720
+ "triple": "aarch64-apple-macosx15.0",
711
721
"os": "Darwin",
722
+ "platform": "MacOSX",
712
723
"cc": "clang",
713
724
"cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
714
725
"cxx": "clang++",
715
726
"cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
716
727
"swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
717
728
"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 }}",
718
- "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64"
729
+ "extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64",
730
+ "host_built_swiftc": "${HostToolchain}/usr/bin/swiftc",
731
+ "macros_swiftflags": ""
719
732
}
720
733
]
721
734
}
0 commit comments