Skip to content

MacOSX SDK 13.1 #22

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
crazy-max merged 3 commits into from
Jun 5, 2023
Merged

MacOSX SDK 13.1 #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e43fdd
MacOSX SDK 13.1
crazy-max Jun 4, 2023
77339d2
cmake 3.23.5
crazy-max Jun 4, 2023
083f0eb
xx 1.2.1
crazy-max Jun 4, 2023
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
46 changes: 23 additions & 23 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ ARG BASE_VARIANT="ubuntu"
ARG UBUNTU_VERSION="20.04"
ARG DEBIAN_VERSION="bullseye"
ARG ALPINE_VERSION="3.16"
ARG XX_VERSION="1.1.2"
ARG XX_VERSION="1.2.1"

ARG CMAKE_VERSION="3.23.1"
ARG OSX_SDK="MacOSX12.3.sdk"
ARG OSX_SDK_URL="https://github.com/joseluisq/macosx-sdks/releases/download/12.3/${OSX_SDK}.tar.xz"
ARG OSX_CROSS_COMMIT="50e86ebca7d14372febd0af8cd098705049161b9"
ARG CMAKE_VERSION="3.23.5"
ARG OSX_SDK="MacOSX13.1.sdk"
ARG OSX_SDK_URL="https://github.com/joseluisq/macosx-sdks/releases/download/13.1/${OSX_SDK}.tar.xz"
ARG OSX_CROSS_COMMIT="ed079949e7aee248ad7e7cb97726cd1c8556afd1"

FROM --platform=$BUILDPLATFORM busybox AS build-dummy-cross
RUN mkdir -p /out/osxcross/osxcross
Expand Down Expand Up @@ -176,16 +176,16 @@ ENV PATH="/osxcross/bin:$PATH"
ENV LD_LIBRARY_PATH="/osxcross/lib:$LD_LIBRARY_PATH"
WORKDIR /src
RUN --mount=type=bind,source=./test <<EOT
set -e
set -e

o64-clang -v test.c -O3 -o /tmp/test
file /tmp/test
o64-clang -v test.c -O3 -o /tmp/test
file /tmp/test

o64-clang++ -v test.cpp -O3 -o /tmp/testcxx
file /tmp/testcxx
o64-clang++ -v test.cpp -O3 -o /tmp/testcxx
file /tmp/testcxx

o64-clang++ -v test_libcxx.cpp -O3 -o /tmp/testlibcxx
file /tmp/testlibcxx
o64-clang++ -v test_libcxx.cpp -O3 -o /tmp/testlibcxx
file /tmp/testlibcxx
EOT

FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
Expand All @@ -197,20 +197,20 @@ ARG TARGETPLATFORM
RUN xx-apk add gcc g++ musl-dev
RUN --mount=type=bind,source=./test \
--mount=from=sdk,src=/osxsdk,target=/xx-sdk <<EOT
set -e
echo "sysroot: $(xx-info sysroot)"
set -e
echo "sysroot: $(xx-info sysroot)"

xx-clang -v test.c -O3 -o /tmp/test
xx-verify /tmp/test
file /tmp/test
xx-clang -v test.c -O3 -o /tmp/test
xx-verify /tmp/test
file /tmp/test

xx-clang++ -v test.cpp -O3 -o /tmp/testcxx
xx-verify /tmp/testcxx
file /tmp/testcxx
xx-clang++ -v test.cpp -O3 -o /tmp/testcxx
xx-verify /tmp/testcxx
file /tmp/testcxx

xx-clang++ -v test_libcxx.cpp -O3 -o /tmp/testlibcxx
xx-verify /tmp/testlibcxx
file /tmp/testlibcxx
xx-clang++ -v test_libcxx.cpp -O3 -o /tmp/testlibcxx
xx-verify /tmp/testlibcxx
file /tmp/testlibcxx
EOT

FROM scratch
Expand Down