Disable ccache for clang-3.4 on Ubuntu 14.04 as this is not currently working.

Disabling it allows clang-3.4 to run C/C++ on docker
pull/6926/head
Vijay Pai 9 years ago
parent a9e62c2ddb
commit 8b79fdef7a
  1. 7
      templates/tools/dockerfile/run_tests_addons.include
  2. 6
      templates/tools/dockerfile/run_tests_addons_nocache.include
  3. 3
      templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template
  4. 8
      tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile

@ -1,7 +1,2 @@
<%include file="ccache_setup.include"/>
#======================
# Zookeeper dependencies
# TODO(jtattermusch): is zookeeper still needed?
RUN apt-get install -y libzookeeper-mt-dev
RUN mkdir /var/local/jenkins
<%include file="run_tests_addons_nocache.include"/>

@ -0,0 +1,6 @@
#======================
# Zookeeper dependencies
# TODO(jtattermusch): is zookeeper still needed?
RUN apt-get install -y libzookeeper-mt-dev
RUN mkdir /var/local/jenkins

@ -33,7 +33,6 @@
<%include file="../../apt_get_basic.include"/>
<%include file="../../cxx_deps.include"/>
<%include file="../../run_tests_addons.include"/>
<%include file="../../run_tests_addons_nocache.include"/>
# Define the default command.
CMD ["bash"]

@ -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?

Loading…
Cancel
Save