From 880c589950be37debf9bf1e583304bd20f1733b2 Mon Sep 17 00:00:00 2001
From: csd4ni3l <96988024+csd4ni3l@users.noreply.github.com>
Date: Mon, 1 Jun 2026 00:19:14 +0200
Subject: [PATCH] fix aarch64 compile by specifying sysroot, revert no
 cross-building, always install cross-build deps

---
 .github/workflows/release.yml | 25 ++++++-------------------
 user/apps/doomgeneric         |  2 +-
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3b6a755..8211f01 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,10 +1,8 @@
 name: Build & Release XunilOS
-
 on:
   push:
     branches:
       - main
-
 jobs:
   build:
     name: Build (${{ matrix.karch }})
@@ -12,7 +10,6 @@ jobs:
     strategy:
       matrix:
         karch: [x86_64, aarch64]
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -20,27 +17,17 @@ jobs:
           submodules: recursive
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install build dependencies (x86_64)
-        if: matrix.karch == 'x86_64'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            build-essential \
-            gcc \
-            gcc-multilib \
-            xorriso \
-            curl \
-            ccache \
-            mold
-
-      - name: Install build dependencies (aarch64)
-        if: matrix.karch == 'aarch64'
+      - name: Install build dependencies
         run: |
+          sudo dpkg --add-architecture arm64
           sudo apt-get update
           sudo apt-get install -y \
             build-essential \
+            gcc-x86_64-linux-gnu \
             gcc-aarch64-linux-gnu \
+            binutils-x86_64-linux-gnu \
             binutils-aarch64-linux-gnu \
+            libc6-dev-amd64-cross \
             libc6-dev-arm64-cross \
             xorriso \
             curl \
@@ -73,13 +60,13 @@ jobs:
     needs: build
     permissions:
       contents: write
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Download x86_64 ISO
         uses: actions/download-artifact@v4
         with:
diff --git a/user/apps/doomgeneric b/user/apps/doomgeneric
index 95694b7..3688f61 160000
--- a/user/apps/doomgeneric
+++ b/user/apps/doomgeneric
@@ -1 +1 @@
-Subproject commit 95694b7b684b53a8f285af0078dab8e363470a0e
+Subproject commit 3688f614201c335aa743d86cc09d67e9f050702a