Skip to content
Snippets Groups Projects
Commit 6865a0ce authored by Jeffrey Phillips Freeman's avatar Jeffrey Phillips Freeman :boom:
Browse files

Updated crossbuild version and darwin sdk version.

parent 5f1e3189
No related branches found
No related tags found
No related merge requests found
...@@ -81,11 +81,11 @@ RUN set -ex && \ ...@@ -81,11 +81,11 @@ RUN set -ex && \
#Build arguments #Build arguments
ARG osxcross_repo="tpoechtrager/osxcross" ARG osxcross_repo="tpoechtrager/osxcross"
ARG osxcross_revision="542acc2ef6c21aeb3f109c03748b1015a71fed63" ARG osxcross_revision="035cc170338b7b252e3f13b0e3ccbf4411bffc41"
ARG darwin_sdk_version="10.10" ARG darwin_sdk_version="11.1"
ARG darwin_osx_version_min="10.6" ARG darwin_osx_version_min="10.9"
ARG darwin_version="14" ARG darwin_version="20.2"
ARG darwin_sdk_url="https://www.dropbox.com/s/yfbesd249w10lpc/MacOSX${darwin_sdk_version}.sdk.tar.xz" ARG darwin_sdk_file="MacOSX${darwin_sdk_version}.sdk.tar.xz"
# ENV available in docker image # ENV available in docker image
ENV OSXCROSS_REPO="${osxcross_repo}" \ ENV OSXCROSS_REPO="${osxcross_repo}" \
...@@ -93,16 +93,17 @@ ENV OSXCROSS_REPO="${osxcross_repo}" \ ...@@ -93,16 +93,17 @@ ENV OSXCROSS_REPO="${osxcross_repo}" \
DARWIN_SDK_VERSION="${darwin_sdk_version}" \ DARWIN_SDK_VERSION="${darwin_sdk_version}" \
DARWIN_VERSION="${darwin_version}" \ DARWIN_VERSION="${darwin_version}" \
DARWIN_OSX_VERSION_MIN="${darwin_osx_version_min}" \ DARWIN_OSX_VERSION_MIN="${darwin_osx_version_min}" \
DARWIN_SDK_URL="${darwin_sdk_url}" DARWIN_SDK_FILE="${darwin_sdk_file}"
COPY ./$DARWIN_SDK_FILE /tmp/
RUN mkdir -p "/tmp/osxcross" \ RUN mkdir -p "/tmp/osxcross" \
&& cd "/tmp/osxcross" \ && cd "/tmp/osxcross" \
&& curl -sLo osxcross.tar.gz "https://codeload.github.com/${OSXCROSS_REPO}/tar.gz/${OSXCROSS_REVISION}" \ && curl -sLo osxcross.tar.gz "https://codeload.github.com/${OSXCROSS_REPO}/tar.gz/${OSXCROSS_REVISION}" \
&& tar --strip=1 -xzf osxcross.tar.gz \ && tar --strip=1 -xzf osxcross.tar.gz \
&& rm -f osxcross.tar.gz \ && rm -f osxcross.tar.gz \
&& curl -sLo tarballs/MacOSX${DARWIN_SDK_VERSION}.sdk.tar.xz \ && mv /tmp/MacOSX${DARWIN_SDK_VERSION}.sdk.tar.xz tarballs/ \
"${DARWIN_SDK_URL}" \ && yes "" | SDK_VERSION="${DARWIN_SDK_VERSION}" OSX_VERSION_MIN="${DARWIN_OSX_VERSION_MIN}" ./build.sh \
&& yes "" | SDK_VERSION="${DARWIN_SDK_VERSION}" OSX_VERSION_MIN="${DARWIN_OSX_VERSION_MIN}" ./build.sh \
&& mv target /usr/osxcross \ && mv target /usr/osxcross \
&& mv tools /usr/osxcross/ \ && mv tools /usr/osxcross/ \
&& ln -sf ../tools/osxcross-macports /usr/osxcross/bin/omp \ && ln -sf ../tools/osxcross-macports /usr/osxcross/bin/omp \
......
File added
docker-compose run --rm opencl-cross-compiler docker-compose run --rm opencl-cross-compiler
docker-compose build docker-compose build
docker-compose push docker-compose push
To create a macOS SDK package (when updating osxcross) do a few things.
1) update the variables in the Dockerfile to point to the new version.
2) extract the new version by following the instructions at https://github.com/tpoechtrager/osxcross
* first clone osxcross then download Xcode into the home directory
* next from the home directory of xcross run `./tools/gen_sdk_package_pbzx.sh <xcode>.xip`
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment