Skip to content
Snippets Groups Projects
Commit 8b79fdef authored by Vijay Pai's avatar Vijay Pai
Browse files

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
parent a9e62c2d
No related branches found
No related tags found
No related merge requests found
<%include file="ccache_setup.include"/> <%include file="ccache_setup.include"/>
#====================== <%include file="run_tests_addons_nocache.include"/>
# Zookeeper dependencies \ No newline at end of file
# TODO(jtattermusch): is zookeeper still needed?
RUN apt-get install -y libzookeeper-mt-dev
RUN mkdir /var/local/jenkins
#======================
# 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 @@ ...@@ -33,7 +33,6 @@
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons_nocache.include"/>
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]
\ No newline at end of file
...@@ -67,14 +67,6 @@ RUN apt-get update && apt-get install -y time && apt-get clean ...@@ -67,14 +67,6 @@ RUN apt-get update && apt-get install -y time && apt-get clean
# C++ dependencies # C++ dependencies
RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean 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 # Zookeeper dependencies
# TODO(jtattermusch): is zookeeper still needed? # TODO(jtattermusch): is zookeeper still needed?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment