Skip to content

Commit fe272e4

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 67b4b37 commit fe272e4

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
@@ -453,73 +453,115 @@ jobs:
453453
"include": [
454454
{
455455
"arch": "amd64",
456+
"cpu": "x86_64",
456457
"os": "Windows",
458+
"platform": "Windows",
459+
"triple": "x86_64-unknown-windows-msvc",
460+
"triple_no_api_level": "x86_64-unknown-windows-msvc",
457461
"cc": "cl",
458462
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
459463
"cxx": "cl",
460464
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
461465
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
466+
"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 }}\"",
467+
"llvm_flags": "",
462468
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
463469
},
464470
{
465471
"arch": "arm64",
472+
"cpu": "aarch64",
466473
"os": "Windows",
474+
"platform": "Windows",
475+
"triple": "aarch64-unknown-windows-msvc",
476+
"triple_no_api_level": "aarch64-unknown-windows-msvc",
467477
"cc": "cl",
468478
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
469479
"cxx": "cl",
470480
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
471481
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
482+
"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 }}\"",
483+
"llvm_flags": "",
472484
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
473485
},
474486
{
475487
"arch": "x86",
488+
"cpu": "i686",
476489
"os": "Windows",
490+
"platform": "Windows",
491+
"triple": "i686-unknown-windows-msvc",
492+
"triple_no_api_level": "i686-unknown-windows-msvc",
477493
"cc": "cl",
478494
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
479495
"cxx": "cl",
480496
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
481497
"swiftflags": "",
498+
"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 }}\"",
499+
"llvm_flags": "",
482500
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86"
483501
},
484502
{
485503
"arch": "arm64",
504+
"cpu": "aarch64",
486505
"os": "Android",
506+
"platform": "Android",
507+
"triple": "aarch64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
508+
"triple_no_api_level": "aarch64-unknown-linux-android",
487509
"cc": "clang",
488510
"cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
489511
"cxx": "clang++",
490512
"cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
491-
"swiftflags": "",
492-
"extra_flags": "-DCMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a"
513+
"swiftflags": "-L ${{ github.workspace }}/BinaryCache/swift/lib/swift/android -g",
514+
"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 }}\"",
515+
"llvm_flags": "-DCMAKE_SYSTEM_PROCESSOR=aarch64 -DLLVM_HOST_TRIPLE=aarch64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
516+
"extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=arm64-v8a"
493517
},
494518
{
495519
"arch": "armv7",
520+
"cpu": "armv7-a",
496521
"os": "Android",
522+
"platform": "Android",
523+
"triple": "armv7-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }}",
524+
"triple_no_api_level": "armv7-unknown-linux-androideabi",
497525
"cc": "clang",
498526
"cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
499527
"cxx": "clang++",
500528
"cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
501-
"swiftflags": "",
502-
"extra_flags": "-DCMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a"
529+
"swiftflags": "-L ${{ github.workspace }}/BinaryCache/swift/lib/swift/android -g",
530+
"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 }}\"",
531+
"llvm_flags": "-DCMAKE_SYSTEM_PROCESSOR=armv7-a -DLLVM_HOST_TRIPLE=armv7a-unknown-linux-androideabi${{ inputs.ANDROID_API_LEVEL }}",
532+
"extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=armeabi-v7a"
503533
},
504534
{
505535
"arch": "i686",
536+
"cpu": "i686",
506537
"os": "Android",
538+
"platform": "Android",
539+
"triple": "i686-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
540+
"triple_no_api_level": "i686-unknown-linux-android",
507541
"cc": "clang",
508542
"cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
509543
"cxx": "clang++",
510544
"cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
511-
"swiftflags": "",
512-
"extra_flags": "-DCMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86"
545+
"swiftflags": "-L ${{ github.workspace }}/BinaryCache/swift/lib/swift/android -g",
546+
"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 }}\"",
547+
"llvm_flags": "-DCMAKE_SYSTEM_PROCESSOR=i686 -DLLVM_HOST_TRIPLE=i686-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
548+
"extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=x86"
513549
},
514550
{
515551
"arch": "x86_64",
552+
"cpu": "x86_64",
516553
"os": "Android",
554+
"platform": "Android",
555+
"triple": "x86_64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
556+
"triple_no_api_level": "x86_64-unknown-linux-android",
517557
"cc": "clang",
518558
"cflags": "${{ steps.context.outputs.ANDROID_CMAKE_C_FLAGS }}",
519559
"cxx": "clang++",
520560
"cxxflags": "${{ steps.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}",
521-
"swiftflags": "",
522-
"extra_flags": "-DCMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86_64"
561+
"swiftflags": "-L ${{ github.workspace }}/BinaryCache/swift/lib/swift/android -g",
562+
"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 }}\"",
563+
"llvm_flags": "-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DLLVM_HOST_TRIPLE=x86_64-unknown-linux-android${{ inputs.ANDROID_API_LEVEL }}",
564+
"extra_flags": "-D CMAKE_ANDROID_API=${{ inputs.ANDROID_API_LEVEL }} -D CMAKE_ANDROID_ARCH_ABI=x86_64"
523565
}
524566
]
525567
}
@@ -528,32 +570,50 @@ jobs:
528570
"include": [
529571
{
530572
"arch": "amd64",
573+
"cpu": "x86_64",
531574
"os": "Windows",
575+
"platform": "Windows",
576+
"triple": "x86_64-unknown-windows-msvc",
577+
"triple_no_api_level": "x86_64-unknown-windows-msvc",
532578
"cc": "cl",
533579
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
534580
"cxx": "cl",
535581
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
536582
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
583+
"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 }}\"",
584+
"llvm_flags": "",
537585
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
538586
},
539587
{
540588
"arch": "arm64",
589+
"cpu": "aarch64",
541590
"os": "Windows",
591+
"platform": "Windows",
592+
"triple": "aarch64-unknown-windows-msvc",
593+
"triple_no_api_level": "aarch64-unknown-windows-msvc",
542594
"cc": "cl",
543595
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
544596
"cxx": "cl",
545597
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
546598
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
599+
"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 }}\"",
600+
"llvm_flags": "",
547601
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
548602
},
549603
{
550604
"arch": "x86",
605+
"cpu": "i686",
551606
"os": "Windows",
607+
"platform": "Windows",
608+
"triple": "i686-unknown-windows-msvc",
609+
"triple_no_api_level": "i686-unknown-windows-msvc",
552610
"cc": "cl",
553611
"cflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
554612
"cxx": "cl",
555613
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
556614
"swiftflags": "",
615+
"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 }}\"",
616+
"llvm_flags": "",
557617
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86"
558618
}
559619
]
@@ -605,22 +665,34 @@ jobs:
605665
"include": [
606666
{
607667
"arch": "x86_64",
668+
"cpu": "x86_64",
608669
"os": "Darwin",
670+
"platform": "MacOSX",
671+
"triple": "x86_64-apple-macosx15.0",
672+
"triple_no_api_level": "x86_64-apple-macosx15.0",
609673
"cc": "clang",
610674
"cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
611675
"cxx": "clang++",
612676
"cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
613677
"swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
678+
"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 }}\"",
679+
"llvm_flags": "",
614680
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=x86_64"
615681
},
616682
{
617683
"arch": "arm64",
684+
"cpu": "aarch64",
618685
"os": "Darwin",
686+
"platform": "MacOSX",
687+
"triple": "arm64-apple-macosx15.0",
688+
"triple_no_api_level": "aarch64-apple-macosx15.0",
619689
"cc": "clang",
620690
"cflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
621691
"cxx": "clang++",
622692
"cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
623693
"swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_FLAGS }}",
694+
"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 }}\"",
695+
"llvm_flags": "",
624696
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=arm64 -D CMAKE_OSX_DEPLOYMENT_TARGET=15.0 -D CMAKE_OSX_ARCHITECTURES=arm64"
625697
}
626698
]

0 commit comments

Comments
 (0)