From 32ca372b9d7f06d880ebfcf1a6d560d411527019 Mon Sep 17 00:00:00 2001 From: Ivan <5627721+abyss7@users.noreply.github.com> Date: Wed, 23 Oct 2019 18:54:18 +0300 Subject: [PATCH] Revert "Update Dockerfile for binary packager (#7456)" (#7458) This reverts commit fa05a5860fbcf3aa3c1bc81f10dca688f78ee38c. --- docker/packager/binary/Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile index 9a489f59d63..d88a2767efd 100644 --- a/docker/packager/binary/Dockerfile +++ b/docker/packager/binary/Dockerfile @@ -57,6 +57,8 @@ RUN apt-get update -y \ rename \ wget +# Build and install tools for cross-linking to Darwin + ENV CC=clang-8 ENV CXX=clang++-8 @@ -64,19 +66,11 @@ ENV CXX=clang++-8 RUN git clone https://github.com/tpoechtrager/apple-libtapi.git RUN cd apple-libtapi && INSTALLPREFIX=/cctools ./build.sh && ./install.sh -# Build and install tools for cross-linking to Darwin RUN git clone https://github.com/tpoechtrager/cctools-port.git RUN cd cctools-port/cctools && ./configure --prefix=/cctools --with-libtapi=/cctools --target=x86_64-apple-darwin && make install -# Download toolchain for Darwin -RUN mkdir -p /build/cmake/toolchain/darwin-x86_64 RUN wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz -RUN tar --strip-components=1 xJf MacOSX10.14.sdk.tar.xz -C /build/cmake/toolchain/darwin-x86_64 - -# Download toolchain for ARM -RUN mkdir -p /build/cmake/toolchain/linux-aarch64 -RUN wget 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?revision=2e88a73f-d233-4f96-b1f4-d8b36e9bb0b9&la=en -O gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -RUN tar --strip-components=1 xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C /build/cmake/toolchain/linux-aarch64 +RUN tar xJf MacOSX10.14.sdk.tar.xz -C /cctools COPY build.sh / CMD ["/bin/bash", "/build.sh"]