From 5e1fbce0758c915808606e3909f253ad3d940ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 9 Aug 2016 15:54:30 +0300 Subject: [PATCH] Disable fetching/building of C++ specific things --- Dockerfile | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index 25af523..1772052 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,10 +21,10 @@ RUN cd llvm/tools && \ git clone -b release_38 --depth=1 https://github.com/llvm-mirror/clang.git && \ git clone --depth=1 -b release_38 https://github.com/llvm-mirror/lld.git --depth=1 -RUN cd llvm/projects && \ - git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libcxx.git && \ - git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libcxxabi.git && \ - git clone https://github.com/llvm-mirror/libunwind.git -b release_38 --depth=1 +#RUN cd llvm/projects && \ +# git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libcxx.git && \ +# git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libcxxabi.git && \ +# git clone https://github.com/llvm-mirror/libunwind.git -b release_38 --depth=1 RUN cd llvm/tools/clang && \ git am /build/patches/clang-*.patch @@ -32,8 +32,8 @@ RUN cd llvm/tools/clang && \ RUN cd llvm/tools/lld && \ git am /build/patches/lld-*.patch -RUN cd llvm/projects/libcxx && \ - git am /build/patches/libcxx-*.patch +#RUN cd llvm/projects/libcxx && \ +# git am /build/patches/libcxx-*.patch RUN git clone --depth=1 git://git.code.sf.net/p/mingw-w64/mingw-w64 RUN cd mingw-w64 && \ @@ -124,40 +124,40 @@ RUN cd /build/mingw-w64/mingw-w64-tools/widl && \ make -j4 && \ make install -RUN git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libcxx.git && \ - git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libcxxabi.git && \ - git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libunwind.git +#RUN git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libcxx.git && \ +# git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libcxxabi.git && \ +# git clone -b release_38 --depth=1 https://github.com/llvm-mirror/libunwind.git -RUN cd libcxx && \ - git am /build/patches/libcxx-*.patch +#RUN cd libcxx && \ +# git am /build/patches/libcxx-*.patch -RUN cd libunwind && \ - git am /build/patches/libunwind-*.patch +#RUN cd libunwind && \ +# git am /build/patches/libunwind-*.patch -RUN cd libunwind && mkdir build && cd build && \ - CXXFLAGS="-nodefaultlibs -D_LIBUNWIND_IS_BAREMETAL" \ - LDFLAGS="/build/prefix/armv7-w64-mingw32/lib/crt2.o /build/prefix/armv7-w64-mingw32/lib/crtbegin.o -lmingw32 /build/prefix/bin/../lib/clang/3.8.1/lib/windows/libclang_rt.builtins-arm.a -lmoldname -lmingwex -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32 /build/prefix/armv7-w64-mingw32/lib/crtend.o" \ - cmake \ - -DCMAKE_CXX_COMPILER_WORKS=TRUE \ - -DLLVM_ENABLE_LIBCXX=TRUE \ - -DCMAKE_BUILD_TYPE=Release \ - -DLIBUNWIND_ENABLE_SHARED=OFF \ - .. +#RUN cd libunwind && mkdir build && cd build && \ +# CXXFLAGS="-nodefaultlibs -D_LIBUNWIND_IS_BAREMETAL" \ +# LDFLAGS="/build/prefix/armv7-w64-mingw32/lib/crt2.o /build/prefix/armv7-w64-mingw32/lib/crtbegin.o -lmingw32 /build/prefix/bin/../lib/clang/3.8.1/lib/windows/libclang_rt.builtins-arm.a -lmoldname -lmingwex -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32 /build/prefix/armv7-w64-mingw32/lib/crtend.o" \ +# cmake \ +# -DCMAKE_CXX_COMPILER_WORKS=TRUE \ +# -DLLVM_ENABLE_LIBCXX=TRUE \ +# -DCMAKE_BUILD_TYPE=Release \ +# -DLIBUNWIND_ENABLE_SHARED=OFF \ +# .. #RUN cd libunwind/build && make -j4 #RUN cd libunwind/build && make install -RUN cd libcxx && mkdir build && cd build && \ - CXXFLAGS="-nodefaultlibs -D_GNU_SOURCE -D_LIBCPP_HAS_NO_CONSTEXPR" \ - LDFLAGS="/build/prefix/armv7-w64-mingw32/lib/crt2.o /build/prefix/armv7-w64-mingw32/lib/crtbegin.o -lmingw32 /build/prefix/bin/../lib/clang/3.8.1/lib/windows/libclang_rt.builtins-arm.a -lmoldname -lmingwex -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32 /build/prefix/armv7-w64-mingw32/lib/crtend.o" \ - cmake \ - -DCMAKE_CXX_COMPILER_WORKS=TRUE \ - -DLIBCXX_ENABLE_SHARED=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="/build/prefix" \ - .. && \ - make -j8 && \ - make install +#RUN cd libcxx && mkdir build && cd build && \ +# CXXFLAGS="-nodefaultlibs -D_GNU_SOURCE -D_LIBCPP_HAS_NO_CONSTEXPR" \ +# LDFLAGS="/build/prefix/armv7-w64-mingw32/lib/crt2.o /build/prefix/armv7-w64-mingw32/lib/crtbegin.o -lmingw32 /build/prefix/bin/../lib/clang/3.8.1/lib/windows/libclang_rt.builtins-arm.a -lmoldname -lmingwex -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32 /build/prefix/armv7-w64-mingw32/lib/crtend.o" \ +# cmake \ +# -DCMAKE_CXX_COMPILER_WORKS=TRUE \ +# -DLIBCXX_ENABLE_SHARED=OFF \ +# -DCMAKE_BUILD_TYPE=Release \ +# -DCMAKE_INSTALL_PREFIX="/build/prefix" \ +# .. && \ +# make -j8 && \ +# make install RUN mkdir gaspp && cd gaspp && \ wget -q https://raw.githubusercontent.com/libav/gas-preprocessor/master/gas-preprocessor.pl && \