Enable SWIFT_NATIVE_SWIFT_TOOLS_PATH on macOS

* Remove unneeded quotes in extra_flags
* Use proper build_arch value on macOS

Author: Steelskin

.github/workflows/build-toolchain.yml

@@ -436,7 +436,7 @@ jobs:
                   "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"
                 },
                 {
                   "arch": "arm64",
@@ -447,7 +447,7 @@ jobs:
                   "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"
                 }
               ]
             }
@@ -462,7 +462,7 @@ jobs:
                   "cxx": "clang++",
                   "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
                   "swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_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"
                 }
               ]
             }
@@ -477,7 +477,7 @@ jobs:
                   "cxx": "clang++",
                   "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
                   "swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_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"
                 },
                 {
                   "arch": "arm64",
@@ -487,7 +487,7 @@ jobs:
                   "cxx": "clang++",
                   "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}",
                   "swiftflags": "${{ steps.context.outputs.DARWIN_CMAKE_Swift_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"
                 }
               ]
             }
@@ -578,7 +578,7 @@ jobs:
     uses: ./.github/workflows/swift-toolchain.yml
     with:
       build_os: Darwin
-      build_arch: aarch64
+      build_arch: arm64
       build_matrix: ${{ needs.context.outputs.darwin_build_matrix }}
       host_matrix: ${{ needs.context.outputs.darwin_host_matrix }}
       target_matrix: ${{ needs.context.outputs.darwin_target_matrix }}

.github/workflows/swift-toolchain.yml

@@ -829,7 +829,7 @@ jobs:
           path: ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
       - uses: thebrowsercompany/gha-download-tar-artifact@717214c9da2a52b3407a5b0a1f31c00b8fde5681 # main
         with:
-          name: early-swift-driver-${{ matrix.os }}-${{ matrix.arch }}
+          name: early-swift-driver-${{ inputs.build_os }}-${{ inputs.build_arch }}
           path: ${{ github.workspace }}/BinaryCache/swift-driver
 
       - uses: actions/checkout@v4
@@ -943,13 +943,13 @@ jobs:
         run: |
           $CxxFlags = "${{ matrix.cxxflags }}"
           $SwiftFlags = ""
+          $EXTRA_FLAGS = @()
 
           if ( "${{ matrix.os }}" -eq "Windows" ) {
             $SWIFTC = cygpath -m (Get-Command swiftc).Source
             # Use toolchain clang to avoid broken __prefetch intrinsic on arm64 in Clang 18.
             # TODO: Use llvm-19 when available. See https://github.com/compnerd/swift-build/issues/846
             $CLANG_LOCATION = Split-Path (Get-Command swiftc).Source
-            $EXTRA_FLAGS = @("-D", "SWIFT_NATIVE_SWIFT_TOOLS_PATH=${{ github.workspace }}/BinaryCache/0/bin")
             if ( "${{ matrix.arch }}" -eq "arm64" ) {
               $EXTRA_FLAGS += "${{ matrix.extra_flags }}".Split()
               $EXTRA_FLAGS += @("-D", "CMAKE_SYSTEM_NAME=Windows")
@@ -986,7 +986,7 @@ jobs:
             $CXX = Join-Path $CLANG_LOCATION "clang++"
             $CACHE = "${{ github.workspace }}/SourceCache/swift/cmake/caches/Darwin-${{ matrix.arch }}.cmake"
             $SDKROOT = xcrun --sdk macosx --show-sdk-path
-            $EXTRA_FLAGS = "${{ matrix.extra_flags }}".Split()
+            $EXTRA_FLAGS += "${{ matrix.extra_flags }}".Split()
             $EXTRA_FLAGS += @("-D", "CMAKE_SYSTEM_NAME=Darwin")
             # TODO: Use early-swift-driver on Windows too.
             $EXTRA_FLAGS += @("-D", "SWIFT_EARLY_SWIFT_DRIVER_BUILD=${{ github.workspace }}/BinaryCache/swift-driver/bin")
@@ -1035,6 +1035,7 @@ jobs:
                 -D SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES `
                 -D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES `
                 -D SWIFT_ENABLE_SYNCHRONIZATION=YES `
+                -D SWIFT_NATIVE_SWIFT_TOOLS_PATH=${{ github.workspace }}/BinaryCache/0/bin `
                 -D SWIFT_PATH_TO_LIBDISPATCH_SOURCE=${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch `
                 -D SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=${{ github.workspace }}/SourceCache/swift-syntax `
                 -D SWIFT_PATH_TO_STRING_PROCESSING_SOURCE=${{ github.workspace }}/SourceCache/swift-experimental-string-processing `