From b9e5df81c99407532fe985335967a5795e0f7a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Tue, 9 Jun 2026 14:53:59 -0300
Subject: [PATCH 01/14] Update build workflow for macOS arm64 support

---
 .github/workflows/build.yml | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eae3d223..5471ac59 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, ubuntu-latest]
+        os: [macos-15-arm64]
+#        os: [macos-15-intel, ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v6
@@ -23,7 +24,7 @@ jobs:
         sudo apt-get update
         sudo apt-get -y install autoconf automake bison flex gcc libelf-dev make texinfo libncurses5-dev patch python3 python-is-python3 subversion wget zlib1g-dev libtool-bin python3-dev bzip2 libgmp3-dev pkg-config
     
-    - name: Install macOS requirements
+    - name: Install macOS intel requirements
       if: matrix.os == 'macos-15-intel'
       shell: arch -x86_64 bash -e {0}
       env:
@@ -33,6 +34,16 @@ jobs:
       run: |
         brew install autoconf automake openssl libelf ncurses zlib gmp wget pkg-config texinfo
 
+    - name: Install macOS arm64 requirements
+      if: matrix.os == 'macos-15-arm64'
+      shell: bash -e {0}
+      env:
+        HOMEBREW_NO_AUTO_UPDATE: 1
+        HOMEBREW_NO_INSTALL_CLEANUP: 1
+        HOMEBREW_NO_ENV_HINTS: 1
+      run: |
+        brew install autoconf automake openssl libelf ncurses zlib gmp wget pkg-config texinfo
+
     - name: Runs all the stages in the shell
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -56,6 +67,18 @@ jobs:
         export PATH=$PATH:$PS3DEV/spu/bin
         ./toolchain.sh
 
+    - name: Runs all the stages in the shell
+      if: matrix.os == 'macos-15-arm64'
+      shell: bash -e {0}
+      run: |
+        mkdir $PWD/ps3dev
+        export PS3DEV=$PWD/ps3dev
+        export PSL1GHT=$PS3DEV
+        export PATH=$PATH:$PS3DEV/bin
+        export PATH=$PATH:$PS3DEV/ppu/bin
+        export PATH=$PATH:$PS3DEV/spu/bin
+        ./toolchain.sh
+
     - name: Get short SHA
       id: slug
       run: echo "sha8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> "$GITHUB_OUTPUT"
@@ -67,4 +90,4 @@ jobs:
     - uses: actions/upload-artifact@v6
       with:
         name: ps3dev-${{ steps.slug.outputs.sha8 }}-${{matrix.os}}
-        path: ps3dev.tar.gz
\ No newline at end of file
+        path: ps3dev.tar.gz

From 4dbb99ccc171fdcaf8b82fa3dbe9a995d8bc471a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Tue, 9 Jun 2026 14:58:36 -0300
Subject: [PATCH 02/14] Add patch for GCC 7.2.0 on macOS ARM64

---
 patches/gcc-7.2.0-PS3-macos-arm64.patch | 27 +++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 patches/gcc-7.2.0-PS3-macos-arm64.patch

diff --git a/patches/gcc-7.2.0-PS3-macos-arm64.patch b/patches/gcc-7.2.0-PS3-macos-arm64.patch
new file mode 100644
index 00000000..c4714b63
--- /dev/null
+++ b/patches/gcc-7.2.0-PS3-macos-arm64.patch
@@ -0,0 +1,27 @@
+diff -ru a/gcc/config/host-darwin.c b/gcc/config/host-darwin.c
+--- a/gcc/config/host-darwin.c 2021-05-14 10:42:08.000000000 +0200
++++ b/gcc/config/host-darwin.c 2021-08-07 22:51:11.000000000 +0200
+@@ -22,6 +22,8 @@
+ #include "coretypes.h"
+ #include "diagnostic-core.h"
+ #include "config/host-darwin.h"
++#include "hosthooks.h"
++#include "hosthooks-def.h"
+ /* Yes, this is really supposed to work.  */
+ static char pch_address_space[1024*1024*1024] __attribute__((aligned (4096)));
+@@ -75,3 +77,5 @@
+   return ret;
+ }
++
++const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
+diff -ru a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
+--- a/gcc/config/aarch64/aarch64.h  2018-02-01 22:09:06.000000000 +0100
++++ b/gcc/config/aarch64/aarch64.h  2021-08-10 00:50:52.000000000 +0200
+@@ -930,7 +930,7 @@
+ #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
+   { "rewrite_mcpu", aarch64_rewrite_mcpu },
+-#if defined(__aarch64__)
++#if defined(__aarch64__) && ! defined(__APPLE__)
+ extern const char *host_detect_local_cpu (int argc, const char **argv);
+ # define EXTRA_SPEC_FUNCTIONS                  \
+   { "local_cpu_detect", host_detect_local_cpu },        \

From ea3f4be446c440679aa161826796a0f19bb8a893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Tue, 9 Jun 2026 15:29:36 -0300
Subject: [PATCH 03/14] Include macOS arm64 patch in GCC build script

Add patch for macOS arm64 support in GCC build script.
---
 scripts/002-gcc-newlib-PPU.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/002-gcc-newlib-PPU.sh b/scripts/002-gcc-newlib-PPU.sh
index 705e0731..4d173ba4 100755
--- a/scripts/002-gcc-newlib-PPU.sh
+++ b/scripts/002-gcc-newlib-PPU.sh
@@ -18,6 +18,11 @@ if [ ! -d ${GCC} ]; then
   cat ../patches/${GCC}-PS3.patch | patch -p1 -d ${GCC}
   cat ../patches/${NEWLIB}-PS3.patch | patch -p1 -d ${NEWLIB}
 
+  ## Patch for macOS arm64
+  if [[ $(uname -s) == 'Darwin' && $(uname -m) == 'arm64' ]]; then
+    cat ../patches/${GCC}-PS3-macos-arm64.patch | patch -p1 -d ${GCC}
+  fi
+
   ## Enter the source code directory.
   cd ${GCC}
 

From 2fb3486b7f22bc5f9fea853301246660a2432b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Tue, 9 Jun 2026 15:31:30 -0300
Subject: [PATCH 04/14] Update OS matrix in GitHub Actions workflow

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5471ac59..08423afe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,8 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-arm64]
-#        os: [macos-15-intel, ubuntu-latest]
+        os: [macos-15-intel, ubuntu-latest, macos-15-arm64]
 
     steps:
     - uses: actions/checkout@v6

From 7ba3a355d645e4179756c6e0c20f4de337e77638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Tue, 9 Jun 2026 15:34:57 -0300
Subject: [PATCH 05/14] Update build matrix to use macos-26

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08423afe..64be438d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, ubuntu-latest, macos-15-arm64]
+        os: [macos-26]
+#        os: [macos-15-intel, ubuntu-latest, macos-26]
 
     steps:
     - uses: actions/checkout@v6

From 8e0800a83ed5e361c3357a7eb1b797ab6f75da71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Tue, 9 Jun 2026 15:36:12 -0300
Subject: [PATCH 06/14] Update macOS condition from 15-arm64 to 26

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 64be438d..11376552 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
         brew install autoconf automake openssl libelf ncurses zlib gmp wget pkg-config texinfo
 
     - name: Install macOS arm64 requirements
-      if: matrix.os == 'macos-15-arm64'
+      if: matrix.os == 'macos-26'
       shell: bash -e {0}
       env:
         HOMEBREW_NO_AUTO_UPDATE: 1
@@ -68,7 +68,7 @@ jobs:
         ./toolchain.sh
 
     - name: Runs all the stages in the shell
-      if: matrix.os == 'macos-15-arm64'
+      if: matrix.os == 'macos-26'
       shell: bash -e {0}
       run: |
         mkdir $PWD/ps3dev

From 168d12a1d58d806723ac2af6e980c65b0dc4bbca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Tue, 9 Jun 2026 16:18:56 -0300
Subject: [PATCH 07/14] Update GCC patch for macOS ARM64 compatibility

---
 patches/gcc-7.2.0-PS3-macos-arm64.patch | 31 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/patches/gcc-7.2.0-PS3-macos-arm64.patch b/patches/gcc-7.2.0-PS3-macos-arm64.patch
index c4714b63..05a297f0 100644
--- a/patches/gcc-7.2.0-PS3-macos-arm64.patch
+++ b/patches/gcc-7.2.0-PS3-macos-arm64.patch
@@ -1,27 +1,30 @@
-diff -ru a/gcc/config/host-darwin.c b/gcc/config/host-darwin.c
---- a/gcc/config/host-darwin.c 2021-05-14 10:42:08.000000000 +0200
-+++ b/gcc/config/host-darwin.c 2021-08-07 22:51:11.000000000 +0200
+diff -Nru gcc-7.2.0/gcc/config/aarch64/aarch64.h gcc-7.2.0-mac/gcc/config/aarch64/aarch64.h
+--- gcc-7.2.0/gcc/config/aarch64/aarch64.h	2017-01-19 20:51:49
++++ gcc-7.2.0-mac/gcc/config/aarch64/aarch64.h	2026-06-09 16:10:14
+@@ -930,7 +930,7 @@
+ #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
+   { "rewrite_mcpu", aarch64_rewrite_mcpu },
+ 
+-#if defined(__aarch64__)
++#if defined(__aarch64__) && ! defined(__APPLE__)
+ extern const char *host_detect_local_cpu (int argc, const char **argv);
+ # define EXTRA_SPEC_FUNCTIONS						\
+   { "local_cpu_detect", host_detect_local_cpu },			\
+diff -Nru gcc-7.2.0/gcc/config/host-darwin.c gcc-7.2.0-mac/gcc/config/host-darwin.c
+--- gcc-7.2.0/gcc/config/host-darwin.c	2017-01-01 09:07:43
++++ gcc-7.2.0-mac/gcc/config/host-darwin.c	2026-06-09 16:09:16
 @@ -22,6 +22,8 @@
  #include "coretypes.h"
  #include "diagnostic-core.h"
  #include "config/host-darwin.h"
 +#include "hosthooks.h"
 +#include "hosthooks-def.h"
+ 
  /* Yes, this is really supposed to work.  */
  static char pch_address_space[1024*1024*1024] __attribute__((aligned (4096)));
 @@ -75,3 +77,5 @@
+ 
    return ret;
  }
 +
 +const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
-diff -ru a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
---- a/gcc/config/aarch64/aarch64.h  2018-02-01 22:09:06.000000000 +0100
-+++ b/gcc/config/aarch64/aarch64.h  2021-08-10 00:50:52.000000000 +0200
-@@ -930,7 +930,7 @@
- #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
-   { "rewrite_mcpu", aarch64_rewrite_mcpu },
--#if defined(__aarch64__)
-+#if defined(__aarch64__) && ! defined(__APPLE__)
- extern const char *host_detect_local_cpu (int argc, const char **argv);
- # define EXTRA_SPEC_FUNCTIONS                  \
-   { "local_cpu_detect", host_detect_local_cpu },        \

From 51e140bccbbeb5d7b273fae2682af48aa275434d Mon Sep 17 00:00:00 2001
From: Damian Parrino <bucanero@users.noreply.github.com>
Date: Tue, 9 Jun 2026 18:58:29 -0300
Subject: [PATCH 08/14] toolchain-only option

---
 .github/workflows/build.yml | 7 +++++++
 scripts/008-psl1ght.sh      | 6 ++++++
 scripts/009-ps3libraries.sh | 6 ++++++
 3 files changed, 19 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 11376552..64e9c9c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,6 +46,9 @@ jobs:
 
     - name: Runs all the stages in the shell
       if: matrix.os == 'ubuntu-latest'
+      shell: bash -e {0}
+      env:
+        BUILD_PS3TOOLCHAIN_ONLY: 1
       run: |
         mkdir $PWD/ps3dev
         export PS3DEV=$PWD/ps3dev
@@ -58,6 +61,8 @@ jobs:
     - name: Runs all the stages in the shell
       if: matrix.os == 'macos-15-intel'
       shell: arch -x86_64 bash -e {0}
+      env:
+        BUILD_PS3TOOLCHAIN_ONLY: 1
       run: |
         mkdir $PWD/ps3dev
         export PS3DEV=$PWD/ps3dev
@@ -70,6 +75,8 @@ jobs:
     - name: Runs all the stages in the shell
       if: matrix.os == 'macos-26'
       shell: bash -e {0}
+      env:
+        BUILD_PS3TOOLCHAIN_ONLY: 1
       run: |
         mkdir $PWD/ps3dev
         export PS3DEV=$PWD/ps3dev
diff --git a/scripts/008-psl1ght.sh b/scripts/008-psl1ght.sh
index 0f66d90d..99740bdb 100755
--- a/scripts/008-psl1ght.sh
+++ b/scripts/008-psl1ght.sh
@@ -1,6 +1,12 @@
 #!/bin/sh -e
 # psl1ght.sh by Naomi Peori (naomi@peori.ca)
 
+## Check if we want to skip this step
+if [[ -n "$BUILD_PS3TOOLCHAIN_ONLY" ]]; then
+    echo "PS3 Toolchain only set. Skipping..."
+    exit 0
+fi
+
 ## Download the source code.
 wget --no-check-certificate https://github.com/ps3dev/PSL1GHT/tarball/master -O psl1ght.tar.gz
 
diff --git a/scripts/009-ps3libraries.sh b/scripts/009-ps3libraries.sh
index 67fd2adc..eee23585 100755
--- a/scripts/009-ps3libraries.sh
+++ b/scripts/009-ps3libraries.sh
@@ -1,6 +1,12 @@
 #!/bin/sh -e
 # ps3libraries.sh by Naomi Peori (naomi@peori.ca)
 
+## Check if we want to skip this step
+if [[ -n "$BUILD_PS3TOOLCHAIN_ONLY" ]]; then
+    echo "PS3 Toolchain only set. Skipping..."
+    exit 0
+fi
+
 ## Download the source code.
 wget --no-check-certificate https://github.com/ps3dev/ps3libraries/tarball/master -O ps3libraries.tar.gz
 

From ca8037976c5f07ae7e8085c237e5a2371da57cdc Mon Sep 17 00:00:00 2001
From: Damian Parrino <bucanero@users.noreply.github.com>
Date: Wed, 10 Jun 2026 11:50:48 -0300
Subject: [PATCH 09/14] clean up

---
 scripts/008-psl1ght.sh      | 6 ------
 scripts/009-ps3libraries.sh | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/scripts/008-psl1ght.sh b/scripts/008-psl1ght.sh
index c721ced6..99740bdb 100755
--- a/scripts/008-psl1ght.sh
+++ b/scripts/008-psl1ght.sh
@@ -10,12 +10,6 @@ fi
 ## Download the source code.
 wget --no-check-certificate https://github.com/ps3dev/PSL1GHT/tarball/master -O psl1ght.tar.gz
 
-## Check if we want to skip this step
-if [[ -n "$BUILD_PS3TOOLCHAIN_ONLY" ]]; then
-    echo "PS3 Toolchain only set. Skipping..."
-    exit 0
-fi
-
 ## Unpack the source code.
 rm -Rf psl1ght && mkdir psl1ght && tar --strip-components=1 --directory=psl1ght -xvzf psl1ght.tar.gz
 
diff --git a/scripts/009-ps3libraries.sh b/scripts/009-ps3libraries.sh
index 325bcf61..eee23585 100755
--- a/scripts/009-ps3libraries.sh
+++ b/scripts/009-ps3libraries.sh
@@ -10,12 +10,6 @@ fi
 ## Download the source code.
 wget --no-check-certificate https://github.com/ps3dev/ps3libraries/tarball/master -O ps3libraries.tar.gz
 
-## Check if we want to skip this step
-if [[ -n "$BUILD_PS3TOOLCHAIN_ONLY" ]]; then
-    echo "PS3 Toolchain only set. Skipping..."
-    exit 0
-fi
-
 ## Unpack the source code.
 rm -Rf ps3libraries && mkdir ps3libraries && tar --strip-components=1 --directory=ps3libraries -xvzf ps3libraries.tar.gz && cd ps3libraries
 

From 68137b7f9dbd358038e3bc78ebfc4d479292dab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Wed, 10 Jun 2026 12:21:38 -0300
Subject: [PATCH 10/14] Update OS matrix for GitHub Actions workflow

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 64e9c9c2..61d7041c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,8 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-26]
-#        os: [macos-15-intel, ubuntu-latest, macos-26]
+        os: [macos-15-intel, ubuntu-latest, macos-26]
 
     steps:
     - uses: actions/checkout@v6

From ddc0336514483fecacca41cc8bf73b91008ad4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Wed, 10 Jun 2026 16:29:23 -0300
Subject: [PATCH 11/14] Modify GitHub Actions workflow for OS and env variable

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61d7041c..87662fad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, ubuntu-latest, macos-26]
+        os: [ubuntu-latest]
+#        os: [macos-15-intel, ubuntu-latest, macos-26]
 
     steps:
     - uses: actions/checkout@v6
@@ -46,8 +47,6 @@ jobs:
     - name: Runs all the stages in the shell
       if: matrix.os == 'ubuntu-latest'
       shell: bash -e {0}
-      env:
-        BUILD_PS3TOOLCHAIN_ONLY: 1
       run: |
         mkdir $PWD/ps3dev
         export PS3DEV=$PWD/ps3dev
@@ -55,6 +54,7 @@ jobs:
         export PATH=$PATH:$PS3DEV/bin
         export PATH=$PATH:$PS3DEV/ppu/bin
         export PATH=$PATH:$PS3DEV/spu/bin
+        export BUILD_PS3TOOLCHAIN_ONLY=1
         ./toolchain.sh
 
     - name: Runs all the stages in the shell

From 8205c0d0d3b335d442bf2734cd3c1859a52fc64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Wed, 10 Jun 2026 17:22:07 -0300
Subject: [PATCH 12/14] Update toolchain.sh invocation with parameters

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 87662fad..064ece46 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,8 +54,7 @@ jobs:
         export PATH=$PATH:$PS3DEV/bin
         export PATH=$PATH:$PS3DEV/ppu/bin
         export PATH=$PATH:$PS3DEV/spu/bin
-        export BUILD_PS3TOOLCHAIN_ONLY=1
-        ./toolchain.sh
+        ./toolchain.sh 1 2 3 4 5 6
 
     - name: Runs all the stages in the shell
       if: matrix.os == 'macos-15-intel'

From 826e750b400944ddea316e60ef5df1831b062829 Mon Sep 17 00:00:00 2001
From: Damian Parrino <bucanero@users.noreply.github.com>
Date: Wed, 10 Jun 2026 17:36:33 -0300
Subject: [PATCH 13/14] fix

---
 .github/workflows/build.yml | 4 +++-
 scripts/008-psl1ght.sh      | 2 +-
 scripts/009-ps3libraries.sh | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 064ece46..cc6e2272 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,6 +47,8 @@ jobs:
     - name: Runs all the stages in the shell
       if: matrix.os == 'ubuntu-latest'
       shell: bash -e {0}
+      env:
+        BUILD_PS3TOOLCHAIN_ONLY: 1
       run: |
         mkdir $PWD/ps3dev
         export PS3DEV=$PWD/ps3dev
@@ -54,7 +56,7 @@ jobs:
         export PATH=$PATH:$PS3DEV/bin
         export PATH=$PATH:$PS3DEV/ppu/bin
         export PATH=$PATH:$PS3DEV/spu/bin
-        ./toolchain.sh 1 2 3 4 5 6
+        ./toolchain.sh
 
     - name: Runs all the stages in the shell
       if: matrix.os == 'macos-15-intel'
diff --git a/scripts/008-psl1ght.sh b/scripts/008-psl1ght.sh
index 99740bdb..feea6760 100755
--- a/scripts/008-psl1ght.sh
+++ b/scripts/008-psl1ght.sh
@@ -2,7 +2,7 @@
 # psl1ght.sh by Naomi Peori (naomi@peori.ca)
 
 ## Check if we want to skip this step
-if [[ -n "$BUILD_PS3TOOLCHAIN_ONLY" ]]; then
+if [ -n "$BUILD_PS3TOOLCHAIN_ONLY" ]; then
     echo "PS3 Toolchain only set. Skipping..."
     exit 0
 fi
diff --git a/scripts/009-ps3libraries.sh b/scripts/009-ps3libraries.sh
index eee23585..4ccd9bcb 100755
--- a/scripts/009-ps3libraries.sh
+++ b/scripts/009-ps3libraries.sh
@@ -2,7 +2,7 @@
 # ps3libraries.sh by Naomi Peori (naomi@peori.ca)
 
 ## Check if we want to skip this step
-if [[ -n "$BUILD_PS3TOOLCHAIN_ONLY" ]]; then
+if [ -n "$BUILD_PS3TOOLCHAIN_ONLY" ]; then
     echo "PS3 Toolchain only set. Skipping..."
     exit 0
 fi

From 2d22440755ff261fa29008da103803788e7167ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= <bucanero@users.noreply.github.com>
Date: Wed, 10 Jun 2026 17:50:55 -0300
Subject: [PATCH 14/14] Update OS matrix for build workflow

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc6e2272..61d7041c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,8 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-#        os: [macos-15-intel, ubuntu-latest, macos-26]
+        os: [macos-15-intel, ubuntu-latest, macos-26]
 
     steps:
     - uses: actions/checkout@v6