Skip to content

Commit fc58a43

Browse files
committed
[Mac build] Add macros build
1 parent fb2523c commit fc58a43

File tree

2 files changed

+94
-60
lines changed

2 files changed

+94
-60
lines changed

.github/workflows/build-toolchain.yml

+20-7
Original file line numberDiff line numberDiff line change
@@ -373,29 +373,33 @@ jobs:
373373
"arch": "amd64",
374374
"cpu": "x86_64",
375375
"triple": "x86_64-unknown-windows-msvc",
376-
"compiler_target": "x86_64-unknown-windows-msvc",
377376
"os": "Windows",
377+
"platform": "Windows",
378378
"cc": "cl",
379379
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
380380
"cxx": "cl",
381381
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
382382
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
383383
"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"
385387
},
386388
{
387389
"arch": "arm64",
388390
"cpu": "aarch64",
389391
"triple": "aarch64-unknown-windows-msvc",
390-
"compiler_target": "aarch64-unknown-windows-msvc",
391392
"os": "Windows",
393+
"platform": "Windows",
392394
"cc": "cl",
393395
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
394396
"cxx": "cl",
395397
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
396398
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
397399
"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"
399403
}
400404
]
401405
}
@@ -406,7 +410,6 @@ jobs:
406410
"arch": "arm64",
407411
"cpu": "aarch64",
408412
"triple": "aarch64-unknown-windows-msvc",
409-
"compiler_target": "aarch64-unknown-windows-msvc",
410413
"os": "Windows",
411414
"cc": "cl",
412415
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
@@ -697,25 +700,35 @@ jobs:
697700
"include": [
698701
{
699702
"arch": "x86_64",
703+
"cpu": "x86_64",
704+
"triple": "x86_64-apple-macosx15.0",
700705
"os": "Darwin",
706+
"platform": "MacOSX",
701707
"cc": "clang",
702708
"cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
703709
"cxx": "clang++",
704710
"cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
705711
"swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
706712
"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": ""
708716
},
709717
{
710718
"arch": "arm64",
719+
"cpu": "aarch64",
720+
"triple": "aarch64-apple-macosx15.0",
711721
"os": "Darwin",
722+
"platform": "MacOSX",
712723
"cc": "clang",
713724
"cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
714725
"cxx": "clang++",
715726
"cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
716727
"swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
717728
"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": ""
719732
}
720733
]
721734
}

0 commit comments

Comments
 (0)