Skip to content

Commit 718402d

Browse files
SteelskinSteelskin
committed
[Mac Build] Add stdlib build
* Add cache files for the stdlib build * Adapt stdlib job to build for both Windows and Mac.
1 parent f7e297d commit 718402d

File tree

4 files changed

+224
-168
lines changed

4 files changed

+224
-168
lines changed

‎.github/workflows/build-toolchain.yml

+80-8
Original file line numberDiff line numberDiff line change
@@ -457,73 +457,115 @@ jobs:
457457
"include": [
458458
{
459459
"arch": "amd64",
460+
"cpu": "x86_64",
460461
"os": "Windows",
462+
"platform": "Windows",
463+
"triple": "x86_64-unknown-windows-msvc",
464+
"triple_no_api_level": "x86_64-unknown-windows-msvc",
461465
"cc": "cl",
462466
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
463467
"cxx": "cl",
464468
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
465469
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
470+
"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_EXE_LINKER_FLAGS }}\"",
471+
"llvm_flags": "",
466472
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
467473
},
468474
{
469475
"arch": "arm64",
476+
"cpu": "aarch64",
470477
"os": "Windows",
478+
"platform": "Windows",
479+
"triple": "aarch64-unknown-windows-msvc",
480+
"triple_no_api_level": "aarch64-unknown-windows-msvc",
471481
"cc": "cl",
472482
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
473483
"cxx": "cl",
474484
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
475485
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
486+
"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_EXE_LINKER_FLAGS }}\"",
487+
"llvm_flags": "",
476488
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
477489
},
478490
{
479491
"arch": "x86",
492+
"cpu": "i686",
480493
"os": "Windows",
494+
"platform": "Windows",
495+
"triple": "i686-unknown-windows-msvc",
496+
"triple_no_api_level": "i686-unknown-windows-msvc",
481497
"cc": "cl",
482498
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
483499
"cxx": "cl",
484500
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
485501
"swiftflags": "",
502+
"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_EXE_LINKER_FLAGS }}\"",
503+
"llvm_flags": "",
486504
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86"
487505
},
488506
{
489507
"arch": "arm64",
508+
"cpu": "aarch64",
490509
"os": "Android",
510+
"platform": "Android",
511+
"triple": "aarch64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
512+
"triple_no_api_level": "aarch64-unknown-linux-android",
491513
"cc": "clang",
492514
"cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
493515
"cxx": "clang++",
494516
"cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
495-
"swiftflags": "",
496-
"extra_flags": "-DCMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a"
517+
"swiftflags": "-L ${{ github.workspace }}/BinaryCache/swift/lib/swift/android -g",
518+
"cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}\"",
519+
"llvm_flags": "-DCMAKE_SYSTEM_PROCESSOR=aarch64 -DLLVM_HOST_TRIPLE=aarch64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
520+
"extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=arm64-v8a"
497521
},
498522
{
499523
"arch": "armv7",
524+
"cpu": "armv7",
500525
"os": "Android",
526+
"platform": "Android",
527+
"triple": "armv7-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }}",
528+
"triple_no_api_level": "armv7-unknown-linux-androideabi",
501529
"cc": "clang",
502530
"cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
503531
"cxx": "clang++",
504532
"cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
505-
"swiftflags": "",
506-
"extra_flags": "-DCMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a"
533+
"swiftflags": "-L ${{ github.workspace }}/BinaryCache/swift/lib/swift/android -g",
534+
"cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}\"",
535+
"llvm_flags": "-DCMAKE_SYSTEM_PROCESSOR=armv7-a -DLLVM_HOST_TRIPLE=armv7a-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }}",
536+
"extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=armeabi-v7a"
507537
},
508538
{
509539
"arch": "i686",
540+
"cpu": "i686",
510541
"os": "Android",
542+
"platform": "Android",
543+
"triple": "i686-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
544+
"triple_no_api_level": "i686-unknown-linux-android",
511545
"cc": "clang",
512546
"cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
513547
"cxx": "clang++",
514548
"cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
515-
"swiftflags": "",
516-
"extra_flags": "-DCMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86"
549+
"swiftflags": "-L ${{ github.workspace }}/BinaryCache/swift/lib/swift/android -g",
550+
"cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}\"",
551+
"llvm_flags": "-DCMAKE_SYSTEM_PROCESSOR=i686 -DLLVM_HOST_TRIPLE=i686-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
552+
"extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=x86"
517553
},
518554
{
519555
"arch": "x86_64",
556+
"cpu": "x86_64",
520557
"os": "Android",
558+
"platform": "Android",
559+
"triple": "x86_64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
560+
"triple_no_api_level": "x86_64-unknown-linux-android",
521561
"cc": "clang",
522562
"cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
523563
"cxx": "clang++",
524564
"cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
525-
"swiftflags": "",
526-
"extra_flags": "-DCMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86_64"
565+
"swiftflags": "-L ${{ github.workspace }}/BinaryCache/swift/lib/swift/android -g",
566+
"cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}\"",
567+
"llvm_flags": "-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DLLVM_HOST_TRIPLE=x86_64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
568+
"extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=x86_64"
527569
}
528570
]
529571
}
@@ -532,32 +574,50 @@ jobs:
532574
"include": [
533575
{
534576
"arch": "amd64",
577+
"cpu": "x86_64",
535578
"os": "Windows",
579+
"platform": "Windows",
580+
"triple": "x86_64-unknown-windows-msvc",
581+
"triple_no_api_level": "x86_64-unknown-windows-msvc",
536582
"cc": "cl",
537583
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
538584
"cxx": "cl",
539585
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
540586
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
587+
"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_EXE_LINKER_FLAGS }}\"",
588+
"llvm_flags": "",
541589
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
542590
},
543591
{
544592
"arch": "arm64",
593+
"cpu": "aarch64",
545594
"os": "Windows",
595+
"platform": "Windows",
596+
"triple": "aarch64-unknown-windows-msvc",
597+
"triple_no_api_level": "aarch64-unknown-windows-msvc",
546598
"cc": "cl",
547599
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
548600
"cxx": "cl",
549601
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
550602
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
603+
"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_EXE_LINKER_FLAGS }}\"",
604+
"llvm_flags": "",
551605
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
552606
},
553607
{
554608
"arch": "x86",
609+
"cpu": "i686",
555610
"os": "Windows",
611+
"platform": "Windows",
612+
"triple": "i686-unknown-windows-msvc",
613+
"triple_no_api_level": "i686-unknown-windows-msvc",
556614
"cc": "cl",
557615
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
558616
"cxx": "cl",
559617
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
560618
"swiftflags": "",
619+
"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_EXE_LINKER_FLAGS }}\"",
620+
"llvm_flags": "",
561621
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86"
562622
}
563623
]
@@ -611,22 +671,34 @@ jobs:
611671
"include": [
612672
{
613673
"arch": "x86_64",
674+
"cpu": "x86_64",
614675
"os": "Darwin",
676+
"platform": "MacOSX",
677+
"triple": "x86_64-apple-macosx15.0",
678+
"triple_no_api_level": "x86_64-apple-macosx15.0",
615679
"cc": "clang",
616680
"cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
617681
"cxx": "clang++",
618682
"cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
619683
"swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
684+
"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 }}\"",
685+
"llvm_flags": "",
620686
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=x86_64"
621687
},
622688
{
623689
"arch": "arm64",
690+
"cpu": "aarch64",
624691
"os": "Darwin",
692+
"platform": "MacOSX",
693+
"triple": "arm64-apple-macosx15.0",
694+
"triple_no_api_level": "arm64-apple-macosx15.0",
625695
"cc": "clang",
626696
"cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
627697
"cxx": "clang++",
628698
"cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
629699
"swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
700+
"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 }}\"",
701+
"llvm_flags": "",
630702
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64"
631703
}
632704
]

0 commit comments

Comments
 (0)