From 44b64f9c348c41c247f0643bed2fe9793d74526a Mon Sep 17 00:00:00 2001
From: Carlos Panato <ctadeu@gmail.com>
Date: Tue, 26 Aug 2025 11:32:12 +0200
Subject: [PATCH] revert osx cross update and add comments

Signed-off-by: Carlos Panato <ctadeu@gmail.com>
---
 .github/workflows/builder.yml | 2 +-
 Dockerfile.builder            | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 2aa17e8..efc80c9 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -11,7 +11,7 @@ on:
         default: "1.25.0"
       osxcross-git-hash:
         description: git commit hash of osx-cross project
-        default: "f873f534c6cdb0776e457af8c7513da1e02abe59"
+        default: "ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b"
       osx-min-version:
         description: minimal macOS SDK deployment target
         default: "10.13"
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 95bcdec..03f6a6e 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -12,7 +12,7 @@ ARG OS_CODENAME=trixie
 
 # osxcross parameters
 ARG OSX_VERSION_MIN=10.13
-ARG OSX_CROSS_COMMIT=f873f534c6cdb0776e457af8c7513da1e02abe59
+ARG OSX_CROSS_COMMIT=ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b
 # ARG APT_MIRROR
 # RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
 #   && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
@@ -76,7 +76,7 @@ WORKDIR "${OSX_CROSS_PATH}"
 # install osxcross:
 RUN \
   git clone https://github.com/tpoechtrager/osxcross.git . \
-  && git checkout -q "${OSX_CROSS_COMMIT:-f873f534c6cdb0776e457af8c7513da1e02abe59}"
+  && git checkout -q "${OSX_CROSS_COMMIT:-ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b}"
 
 # install osx sdk
 COPY --from=osx-sdk "${OSX_CROSS_PATH}/." "${OSX_CROSS_PATH}"
@@ -102,12 +102,13 @@ RUN  patch -p1 < osxcross-08-52-08.patch
 
 COPY scripts/llvm.sh "${OSX_CROSS_PATH}/"
 RUN \
-  # install clang-16
+  # install clang-18
   if [ "${OS_CODENAME}" = "trixie" ]; then \
     apt-get update && apt-get install -y --no-install-recommends clang-18 && \
     update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 && \
     update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100; \
   else \
+  # install clang-16
     ./llvm.sh 16 && \
     update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100 && \
     update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100; \