Skip to content

revert osx cross update and add comments #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gythialy merged 1 commit into from
Aug 26, 2025
Merged

revert osx cross update and add comments #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand All @@ -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; \
Expand Down
Loading