@@ -23,18 +23,20 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
2323 pkg-config \
2424 tar \
2525 unzip \
26+ llvm \
2627 && rm -rf /var/lib/apt/lists/*
2728# Install toolchains in /opt
2829RUN curl downloads.arduino.cc/tools/internal/toolchains.tar.gz | tar -xz "opt"
2930 # install proper arm toolchains (already present in the toolchains.tar.gz archive)
3031 # curl -L 'https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz' | tar -xJC /opt && \
3132 # curl -L 'https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz' | tar -xJC /opt
3233
33- RUN cd /opt/osxcross \
34- git pull \
35- # use a specific version of osxcross (it does not have tags)
36- git checkout da2c3d4ff604458a931b08b3af800c5a454136de \
37- UNATTENDED=1 SDK_VERSION=10.15 ./build.sh
34+ RUN cd /opt/osxcross && \
35+ git pull && \
36+ # use a specific version of osxcross (it does not have tags), this commit has the automatic install of compiler_rt libraries
37+ git checkout b875d7c1360c8ff2077463d7a5a12e1cff1cc683 && \
38+ UNATTENDED=1 SDK_VERSION=10.15 ./build.sh && \
39+ ENABLE_COMPILER_RT_INSTALL=1 SDK_VERSION=10.15 ./build_compiler_rt.sh
3840# Set toolchains paths
3941# arm-linux-gnueabihf-gcc -> linux_arm
4042# aarch64-linux-gnu-gcc -> linux_arm64
@@ -59,6 +61,7 @@ RUN CROSS_COMPILE=x86_64-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh && \
5961FROM ubuntu:latest
6062# Copy all the installed toolchains and compiled libs
6163COPY --from=build /opt /opt
64+ COPY --from=build /usr/lib/llvm-10/lib/clang/10.0.0 /usr/lib/llvm-10/lib/clang/10.0.0
6265ENV TZ=Europe/Rome
6366RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
6467 apt-get update && \
0 commit comments