Merge pull request #4652 from ctiller/no-cache

Disable ccache for the moment
pull/4642/head^2
Michael Lumish 9 years ago
commit d4f86d0232
  1. 9
      tools/jenkins/grpc_jenkins_slave/Dockerfile
  2. 9
      tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile

@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \
autotools-dev \
build-essential \
bzip2 \
ccache \
curl \
gcc \
gcc-multilib \
@ -62,14 +61,6 @@ 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

@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \
autotools-dev \
build-essential \
bzip2 \
ccache \
curl \
gcc \
gcc-multilib \
@ -62,14 +61,6 @@ 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

Loading…
Cancel
Save