From 6959329fd6d6f3a069b76702d43787b30c5da0c5 Mon Sep 17 00:00:00 2001
From: Minh141120 <minh.itptit@gmail.com>
Date: Mon, 15 Sep 2025 09:32:51 +0700
Subject: [PATCH] chore: add install-rust-targets step for macOS universal
 builds

---
 .../template-tauri-build-macos-external.yml      |  1 -
 .github/workflows/template-tauri-build-macos.yml |  1 -
 Makefile                                         | 16 ++++++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/template-tauri-build-macos-external.yml b/.github/workflows/template-tauri-build-macos-external.yml
index e69e298a6..8f61b86fa 100644
--- a/.github/workflows/template-tauri-build-macos-external.yml
+++ b/.github/workflows/template-tauri-build-macos-external.yml
@@ -89,7 +89,6 @@ jobs:
 
       - name: Build app
         run: |
-          rustup target add x86_64-apple-darwin
           make build
         env:
           APP_PATH: '.'
diff --git a/.github/workflows/template-tauri-build-macos.yml b/.github/workflows/template-tauri-build-macos.yml
index 40cf4e839..332ecc42f 100644
--- a/.github/workflows/template-tauri-build-macos.yml
+++ b/.github/workflows/template-tauri-build-macos.yml
@@ -167,7 +167,6 @@ jobs:
 
       - name: Build app
         run: |
-          rustup target add x86_64-apple-darwin
           make build
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Makefile b/Makefile
index 457f314ef..65fc67fc4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,17 @@ endif
 	yarn build:core
 	yarn build:extensions && yarn build:extensions-web
 
+# Install required Rust targets for macOS universal builds
+install-rust-targets:
+ifeq ($(shell uname -s),Darwin)
+	@echo "Detected macOS, installing universal build targets..."
+	rustup target add x86_64-apple-darwin
+	rustup target add aarch64-apple-darwin
+	@echo "Rust targets installed successfully!"
+else
+	@echo "Not macOS; skipping Rust target installation."
+endif
+
 dev: install-and-build
 	yarn download:bin
 	yarn download:lib
@@ -68,11 +79,12 @@ test: lint
 	cargo test --manifest-path src-tauri/utils/Cargo.toml
 
 # Builds and publishes the app
-build-and-publish: install-and-build
+build-and-publish: install-and-build install-rust-targets
 	yarn build
 
 # Build
-build: install-and-build
+build: install-and-build install-rust-targets
+	install-rust-targets
 	yarn download:lib
 	yarn build