From bbacad912ee8b5c78c0179fa0e2920ef27a64a05 Mon Sep 17 00:00:00 2001
From: Artyom Tetyukhin <51746822+arttet@users.noreply.github.com>
Date: Tue, 19 Dec 2023 13:45:13 +0300
Subject: [PATCH] feature: build all arm64e targets (#5)

---
 .github/workflows/rust-compiler-builder.yml | 41 ++-------------------
 Makefile                                    |  4 +-
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/rust-compiler-builder.yml b/.github/workflows/rust-compiler-builder.yml
index a5a16c2..c8551eb 100644
--- a/.github/workflows/rust-compiler-builder.yml
+++ b/.github/workflows/rust-compiler-builder.yml
@@ -19,50 +19,15 @@ jobs:
           # https://github.com/actions/runner-images/tree/main/images/macos
           # https://developer.apple.com/support/xcode/
 
-          - rust-targets: arm64e-apple-ios
+          - rust-targets: arm64e-apple-ios,aarch64-apple-ios,arm64e-apple-darwin,aarch64-apple-darwin
             os: macos-13
             xcode-version: 15.0.1
-            rust-config: configure-with-llvm
-            rust-verbose-level: 0
-            macosx_deployment_target: 11.0
-            iphoneos_deployment_target: 14.0
-
-          - rust-targets: arm64e-apple-ios
-            os: macos-13
-            xcode-version: 14.3.1
             rust-config: configure
             rust-verbose-level: 0
+            rust-use-lld: true
             macosx_deployment_target: 11.0
             iphoneos_deployment_target: 14.0
 
-          - rust-targets: aarch64-apple-ios
-            os: macos-13
-            xcode-version: 15.0.1
-            rust-config: configure
-            rust-verbose-level: 0
-
-          - rust-targets: arm64e-apple-darwin
-            os: macos-13
-            xcode-version: 15.0.1
-            rust-config: configure-with-llvm
-            rust-verbose-level: 0
-            macosx_deployment_target: 11.0
-            iphoneos_deployment_target: 14.0
-
-          - rust-targets: arm64e-apple-darwin
-            os: macos-13
-            xcode-version: 14.3.1
-            rust-config: configure
-            rust-verbose-level: 0
-            macosx_deployment_target: 11.0
-            iphoneos_deployment_target: 14.0
-
-          - rust-targets: aarch64-apple-darwin
-            os: macos-13
-            xcode-version: 15.0.1
-            rust-config: configure
-            rust-verbose-level: 0
-
     runs-on: ${{ matrix.os }}
     env:
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
@@ -106,6 +71,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: rust-lang/rust
+          ref: master
           submodules: true
           path: rust
 
@@ -113,6 +79,7 @@ jobs:
         run: make ${{ matrix.rust-config }}
         env:
           RUST_VERBOSE: ${{ matrix.rust-verbose-level }}
+          RUST_USE_LLD: ${{ matrix.rust-use-lld }}
 
       - name: Build Rust
         run: make all
diff --git a/Makefile b/Makefile
index 72a4b2f..7af3a81 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ RUST_CHANNEL ?= dev
 RUST_DESCRIPTION ?= ""
 RUST_INSTALL_DIR ?= install
 RUST_DIST_FORMATS ?= xz
+RUST_USE_LLD ?= false
 
 # NOTE: use Makefile.local for customization
 -include Makefile.local
@@ -57,6 +58,7 @@ configure:		## Configure Rust
 		--set build.verbose=${RUST_VERBOSE} \
 		--set rust.channel=${RUST_CHANNEL} \
 		--set rust.description=${RUST_DESCRIPTION} \
+		--set rust.use-lld=${RUST_USE_LLD} \
 		--dist-compression-formats=${RUST_DIST_FORMATS} \
 		--prefix=${RUST_INSTALL_DIR}
 
@@ -79,7 +81,7 @@ configure-with-llvm:	## Configure Rust and LLVM
 		--set build.verbose=${RUST_VERBOSE} \
 		--set rust.channel=${RUST_CHANNEL} \
 		--set rust.description=${RUST_DESCRIPTION} \
-		--set rust.use-lld=true \
+		--set rust.use-lld=${RUST_USE_LLD} \
 		--set rust.omit-git-hash=true \
 		--dist-compression-formats=${RUST_DIST_FORMATS} \
 		--prefix=${RUST_INSTALL_DIR}