Revert "Disable ccache for the moment"

9 years ago · 9f1d863e4e
parent 3bd7ecce16
commit 9f1d863e4e
2 changed files with 18 additions and 0 deletions
--- a/tools/jenkins/grpc_jenkins_slave/Dockerfile
+++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile
@ -38,6 +38,7 @@ RUN apt-get update && apt-get install -y \
  autotools-dev \
  build-essential \
  bzip2 \
+  ccache \
  curl \
  gcc \
  gcc-multilib \
@ -61,6 +62,14 @@ RUN apt-get update && apt-get install -y \
  wget \
  zip && 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++
+
 ##################
 # C++ dependencies
 RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang
--- a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile
+++ b/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile
@ -38,6 +38,7 @@ RUN apt-get update && apt-get install -y \
  autotools-dev \
  build-essential \
  bzip2 \
+  ccache \
  curl \
  gcc \
  gcc-multilib \
@ -61,6 +62,14 @@ RUN apt-get update && apt-get install -y \
  wget \
  zip && 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++
+
 ##################
 # C++ dependencies
 RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang