diff options
| author |  Matt Kwong <mattkwong@google.com> | 2018-05-21 19:27:21 -0700 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2018-05-23 10:40:25 -0700 |
| commit | 048bb0713b4952ba6c9340cc944458ce99715fbc (patch) | |
| tree | cd1a7d0d379b4ab461784187ccde8b2e081e3b52 /tools/dockerfile | |
| parent | 528775db084d5561f6bb4bc4c4fa69bd629dfa02 (diff) | |
Remove installed from source Clang in standard Jessie Dockerfile
Diffstat (limited to 'tools/dockerfile')
| -rw-r--r-- | tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index 8a20d92d97..ad1fbec5df 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -72,44 +72,6 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean -#================= -# Use cmake 3.6 from jessie-backports -# should only be used for images based on debian jessie. - -RUN echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list -RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean - -#================= -# Update clang to a version with improved tsan and fuzzing capabilities - -RUN git clone -n -b release_38 http://llvm.org/git/llvm.git && \ - cd llvm && git checkout ad57503 && cd .. -RUN git clone -n -b release_38 http://llvm.org/git/clang.git && \ - cd clang && git checkout ad2c56e && cd .. -RUN git clone -n -b release_38 http://llvm.org/git/compiler-rt.git && \ - cd compiler-rt && git checkout 3176922 && cd .. -RUN git clone -n -b release_38 \ - http://llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && \ - git checkout c288525 && cd .. -RUN git clone -n -b release_38 http://llvm.org/git/libcxx.git && \ - cd libcxx && git checkout fda3549 && cd .. -RUN git clone -n -b release_38 http://llvm.org/git/libcxxabi.git && \ - cd libcxxabi && git checkout 8d4e51d && cd .. - -RUN mv clang llvm/tools -RUN mv compiler-rt llvm/projects -RUN mv clang-tools-extra llvm/tools/clang/tools -RUN mv libcxx llvm/projects -RUN mv libcxxabi llvm/projects - -RUN mkdir llvm-build -RUN cd llvm-build && cmake \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_PREFIX:STRING=/usr \ - -DLLVM_TARGETS_TO_BUILD:STRING=X86 \ - ../llvm -RUN make -C llvm-build -j 12 && make -C llvm-build install && rm -rf llvm-build - RUN mkdir /var/local/jenkins |