From a419ab6832d41e86d3d04a6ebb19156814221554 Mon Sep 17 00:00:00 2001
From: stevezhengshiqi <zheng.shi.qi@qq.com>
Date: Fri, 10 May 2024 22:19:03 -0400
Subject: [PATCH 1/2] buildmtoc: Add ARCHS=x86_64 to build mtoc

---
 buildmtoc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildmtoc.sh b/buildmtoc.sh
index 6a9bb5a876..a59c3c1d98 100755
--- a/buildmtoc.sh
+++ b/buildmtoc.sh
@@ -197,7 +197,7 @@ fnCompileMtoc ()
 		if [[ ${OSXVER} < 10.15 ]]; then
 			cmd="(make LTO= EFITOOLS=efitools -C libstuff) && (make -C efitools)"
 		else
-			cmd="(xcodebuild -scheme mtoc -configuration Release ONLY_ACTIVE_ARCH=YES CONFIGURATION_BUILD_DIR=$PREFIX/bin)"
+			cmd="(xcodebuild -scheme mtoc -configuration Release ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES CONFIGURATION_BUILD_DIR=$PREFIX/bin)"
 		fi
     logfile="$DIR_LOGS/mtoc.make.log.txt"
     echo "$cmd" > "$logfile"

From a4b5ed35cc2a30be4a95aaea5a48e2032a1f38f6 Mon Sep 17 00:00:00 2001
From: stevezhengshiqi <zheng.shi.qi@qq.com>
Date: Fri, 10 May 2024 22:28:00 -0400
Subject: [PATCH 2/2] buildme: Avoid Terminal Window Setup for CI

---
 buildme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/buildme b/buildme
index f32cb22200..f5ad307b0d 100755
--- a/buildme
+++ b/buildme
@@ -20,6 +20,7 @@ COL_WHITE="\x1b[37;01m"
 COL_BLUE="\x1b[34;01m"
 COL_RESET="\x1b[39;49;00m"
 # ====== Main Window SetUp ======
+if [[ "$2" != ci ]]; then
 osascript <<EOF
 tell application "System Events" to tell application "Finder"
 	tell process "Terminal"
@@ -37,6 +38,7 @@ tell application "Terminal"
 #	set position of first window to {650, 420}
 end tell
 EOF
+fi
 # ====== Clover workspace SetUp ======
 cd "$(dirname $([ -L $0 ] && readlink $0 || echo $0))"
 declare -r CLOVERROOT="$PWD"