diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-17 09:39:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-06-17 09:39:59 -0700 |
| commit | 8edaa35842bfc61c44a990d308134496e18c90c0 (patch) | |
| tree | 97915e310b26b2864bb4bfb00574466bc55f0122 /tools | |
| parent | 0aa52e3e3db1e7787819511a695154a4086df60b (diff) | |
| parent | 8b79fdef7a1407abe40372191593e34e456c35bf (diff) | |
Merge pull request #6926 from vjpai/clang34
Disable ccache for ubuntu-14.04/clang3.4 docker config
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile index 1e43e6b25c..5982c9783e 100644 --- a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile @@ -67,14 +67,6 @@ RUN apt-get update && apt-get install -y time && apt-get clean # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean -# Prepare ccache -RUN ln -s /usr/bin/ccache /usr/local/bin/gcc -RUN ln -s /usr/bin/ccache /usr/local/bin/g++ -RUN ln -s /usr/bin/ccache /usr/local/bin/cc -RUN ln -s /usr/bin/ccache /usr/local/bin/c++ -RUN ln -s /usr/bin/ccache /usr/local/bin/clang -RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ - #====================== # Zookeeper dependencies # TODO(jtattermusch): is zookeeper still needed? |