@@ -7,9 +7,12 @@ FROM ghcr.io/gythialy/osx-sdk:${OSK_SDK:-macos-13} AS osx-sdk
7
7
8
8
FROM golang :${ GO_VERSION :-1.25 . 0 } -${ OS_CODENAME :-trixie } AS base
9
9
10
+ # Re-declare ARG after FROM to make it available in this stage
11
+ ARG OS_CODENAME = trixie
12
+
10
13
# osxcross parameters
11
14
ARG OSX_VERSION_MIN = 10.13
12
- ARG OSX_CROSS_COMMIT = ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b
15
+ ARG OSX_CROSS_COMMIT = f873f534c6cdb0776e457af8c7513da1e02abe59
13
16
# ARG APT_MIRROR
14
17
# RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
15
18
# && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
@@ -23,6 +26,9 @@ RUN set -x; echo "Starting image build for Debian " \
23
26
&& dpkg --add-architecture armhf \
24
27
&& dpkg --add-architecture i386 \
25
28
&& apt-get update \
29
+ && if [ "${OS_CODENAME}" != "trixie" ]; then \
30
+ apt-get install -y -q software-properties-common multistrap lzma-dev; \
31
+ fi \
26
32
&& apt-get install -y -q \
27
33
autoconf \
28
34
automake \
@@ -42,16 +48,16 @@ RUN set -x; echo "Starting image build for Debian " \
42
48
libtool \
43
49
llvm \
44
50
mercurial \
45
- multistrap \
51
+ mmdebstrap \
46
52
patch \
47
- software-properties-common \
48
53
subversion \
49
54
wget \
50
55
xz-utils \
51
56
# cmake \
52
57
qemu-user-static \
53
58
libxml2-dev \
54
- lzma-dev \
59
+ liblzma-dev \
60
+ zlib1g-dev \
55
61
openssl \
56
62
mingw-w64 \
57
63
musl-tools \
@@ -70,13 +76,13 @@ WORKDIR "${OSX_CROSS_PATH}"
70
76
# install osxcross:
71
77
RUN \
72
78
git clone https ://github . com /tpoechtrager /osxcross . git . \
73
- && git checkout -q "${OSX_CROSS_COMMIT:-ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b }"
79
+ && git checkout -q "${OSX_CROSS_COMMIT:-f873f534c6cdb0776e457af8c7513da1e02abe59 }"
74
80
75
81
# install osx sdk
76
82
COPY --from = osx -sdk "${OSX_CROSS_PATH}/." "${OSX_CROSS_PATH}"
77
83
78
84
# install cmake
79
- ARG CMAKE_VERSION = 3.28 . 3
85
+ ARG CMAKE_VERSION = 4.1 . 0
80
86
RUN \
81
87
# wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz \
82
88
# && tar -xf cmake-${CMAKE_VERSION}.tar.gz \
@@ -97,9 +103,15 @@ RUN patch -p1 < osxcross-08-52-08.patch
97
103
COPY scripts /llvm . sh "${OSX_CROSS_PATH}/"
98
104
RUN \
99
105
# install clang-16
100
- . /llvm . sh 16 \
101
- && update -alternatives --install /usr /bin /clang clang /usr /bin /clang -16 100 \
102
- && update -alternatives --install /usr /bin /clang ++ clang ++ /usr/bin /clang ++-16 100 \
106
+ if [ "${OS_CODENAME}" = "trixie" ] ; then \
107
+ apt -get update && apt -get install -y --no -install -recommends clang -18 && \
108
+ update -alternatives --install /usr /bin /clang clang /usr /bin /clang -18 100 && \
109
+ update -alternatives --install /usr /bin /clang ++ clang ++ /usr/bin /clang ++-18 100 ; \
110
+ else \
111
+ . /llvm . sh 16 && \
112
+ update -alternatives --install /usr /bin /clang clang /usr /bin /clang -16 100 && \
113
+ update -alternatives --install /usr /bin /clang ++ clang ++ /usr/bin /clang ++-16 100 ; \
114
+ fi \
103
115
&& clang --version \
104
116
&& clang ++ --version \
105
117
&& UNATTENDED = yes OSX_VERSION_MIN = ${ OSX_VERSION_MIN :-10.13 } . /build . sh \
0 commit comments