Skip to content
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.

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

Update darwin sdk and version #87

Merged
merged 16 commits into from
May 19, 2021
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix: make symbolic links to the libraries on /usr/lib
  • Loading branch information
kuisathaverat committed May 19, 2021
commit 29d29880167acfb6b200704a404ec96105fc14cd
11 changes: 9 additions & 2 deletions go1.16/darwin/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ RUN \
python \
libssl-dev \
libxml2-dev \
libz-dev \
lzma-dev \
llvm-dev \
uuid-dev \
&& rm -rf /var/lib/apt/lists/*

{{if eq .DEBIAN_VERSION "10"}}
Expand Down Expand Up @@ -42,6 +44,8 @@ RUN \
&& rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"

ENV PATH $OSXCROSS_PATH/bin:$PATH
# Add osxcross libraries to the library PATH
ENV LD_LIBRARY_PATH /usr/osxcross/lib:$LD_LIBRARY_PATH

COPY rootfs /

Expand All @@ -51,11 +55,14 @@ RUN cd / \
&& file helloWorld \
&& file helloWorld | grep -c 'Mach-O 64-bit x86_64'

# MacOSX10.14 SDK does not have 32bits compiler
{{if ne .DEBIAN_VERSION "10"}}
RUN cd / \
&& o32-clang helloWorld.c -o helloWorld \
&& o32-clang++ helloWorld.c -o helloWorld \
&& file helloWorld \
&& file helloWorld | grep -c 'Mach-O i386' \
&& rm helloWorld.c helloWorld
{{ end }}

# Build-time metadata as defined at http://label-schema.org.
ARG BUILD_DATE
Expand Down