From bad346717a64972f54025af26806d105c3c73369 Mon Sep 17 00:00:00 2001
From: Margen67 <Margen67@users.noreply.github.com>
Date: Tue, 14 Jul 2026 02:09:15 -0700
Subject: [PATCH] [xb] Skip aarch64 submodule for x64 target

---
 .github/workflows/Linux_x86.yml   |  2 +-
 .github/workflows/Windows_x86.yml |  4 +++-
 xenia-build.py                    | 10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml
index 352565a2c..f781d7d52 100644
--- a/.github/workflows/Linux_x86.yml
+++ b/.github/workflows/Linux_x86.yml
@@ -85,7 +85,7 @@ jobs:
 
       - name: Download submodules
         run: |- # Exclude unneeded submodules
-          SUBMODULES=$(grep -oP '(?<=path = )(?!third_party\/DirectX(?:-Headers|ShaderCompiler)).+' .gitmodules)
+          SUBMODULES=$(grep -oP '(?<=path = )(?!third_party\/(?:DirectX(?:-Headers|ShaderCompiler)|xbyak_aarch64)).+' .gitmodules)
           git submodule update --init --depth=1 -j$(getconf _NPROCESSORS_ONLN) $SUBMODULES
 
       - name: Build Xenia
diff --git a/.github/workflows/Windows_x86.yml b/.github/workflows/Windows_x86.yml
index 681a3c2d5..dff4513c3 100644
--- a/.github/workflows/Windows_x86.yml
+++ b/.github/workflows/Windows_x86.yml
@@ -59,7 +59,9 @@ jobs:
           }
 
       - name: Download submodules
-        run: git submodule update --init --depth=1 -j $env:NUMBER_OF_PROCESSORS
+        run: |- # Exclude unneeded submodules
+          $SUBMODULES=(Select-String -CaseSensitive '(?<=path = )(?!third_party\/xbyak_aarch64).+' .gitmodules).Matches.Value
+          git submodule update --init --depth=1 -j $env:NUMBER_OF_PROCESSORS $SUBMODULES
 
       - name: Build Xenia
         run: python xenia-build.py build --config=Release --target=xenia-app
diff --git a/xenia-build.py b/xenia-build.py
index b62646397..80003679f 100755
--- a/xenia-build.py
+++ b/xenia-build.py
@@ -599,19 +599,21 @@ def git_submodule_update():
     if sys.platform == "linux":
         submodules_ignore = ["DirectX-Headers", "DirectXShaderCompiler"]
     else:
-        submodules_ignore = None
+        submodules_ignore = []
+    if is_amd64():
+        submodules_ignore.append("xbyak_aarch64")
     if submodules_ignore:
         with open(".gitmodules") as f:
             gitmodules = f.read()
         submodules = re_findall(r"(?<=path = )(?!third_party\/(?:" + "|".join(submodules_ignore) + r")).+", gitmodules)
     else:
-        submodules = None
+        submodules = []
     # Sync submodule URLs from .gitmodules to local config
     shell_call([
         "git",
         "submodule",
         "sync",
-        *(submodules or []),
+        *submodules,
         ])
     # Then update all submodules to their recorded commits
     shell_call([
@@ -623,7 +625,7 @@ def git_submodule_update():
         "--init",
         "--depth=1",
         "-j", f"{os.cpu_count()}",
-        *(submodules or []),
+        *submodules,
         ])