From e63d777756f9726288d5fb5b31bec071df2de8ef Mon Sep 17 00:00:00 2001
From: Humberto Dias <hldtux@gmail.com>
Date: Sun, 11 Oct 2026 11:02:51 -0300
Subject: [PATCH 1/2] Clear host CC, CXX, and CPP before every build step.

A preset compiler makes ps3libraries' autotools skip powerpc64-ps3-elf-gcc. Unsetting it in toolchain.sh covers the other steps as well.
---
 toolchain.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/toolchain.sh b/toolchain.sh
index a6b1dc6a..c2da0e0b 100755
--- a/toolchain.sh
+++ b/toolchain.sh
@@ -52,6 +52,9 @@ if [ $1 ]; then
   BUILD_SCRIPTS="$REQUESTS"
 fi
 
+## A preset host compiler makes autotools skip powerpc64-ps3-elf-gcc.
+unset CC CXX CPP
+
 ## Run the build scripts.
 for SCRIPT in $BUILD_SCRIPTS; do
   echo ">>> Running: $SCRIPT"

From f3da6bb2488ef8c63cc7c0439e21ad95f4f2446c Mon Sep 17 00:00:00 2001
From: Humberto Dias <hldtux@gmail.com>
Date: Sun, 11 Oct 2026 12:18:46 -0300
Subject: [PATCH 2/2] Also clear host LDFLAGS before every build step.

Binutils was unsetting LDFLAGS only for the PPU build. The same host flags affect the other steps.
---
 toolchain.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain.sh b/toolchain.sh
index c2da0e0b..aba8250b 100755
--- a/toolchain.sh
+++ b/toolchain.sh
@@ -52,8 +52,8 @@ if [ $1 ]; then
   BUILD_SCRIPTS="$REQUESTS"
 fi
 
-## A preset host compiler makes autotools skip powerpc64-ps3-elf-gcc.
-unset CC CXX CPP
+## A preset host CC, CXX, CPP, or LDFLAGS is picked up by the cross build.
+unset CC CXX CPP LDFLAGS
 
 ## Run the build scripts.
 for SCRIPT in $BUILD_SCRIPTS; do