Commit 6f4b888a authored by xoviat's avatar xoviat Committed by GitHub
Browse files

docker: cleanup and split off ccache into separate function

parent f1d5cb6c
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# BUILD_DEPENDS (may be used by config.sh, can be empty) # BUILD_DEPENDS (may be used by config.sh, can be empty)
set -e set -e
if [ $USE_CCACHE == 1 ]; then function activate_ccache {
# Link up the correct location for ccache # Link up the correct location for ccache
ln -s /parent-home/.ccache $HOME/.ccache ln -s /parent-home/.ccache $HOME/.ccache
...@@ -17,16 +17,20 @@ if [ $USE_CCACHE == 1 ]; then ...@@ -17,16 +17,20 @@ if [ $USE_CCACHE == 1 ]; then
# Create fake compilers and prepend them to the PATH # Create fake compilers and prepend them to the PATH
# Note that yum is supposed to create these for us, # Note that yum is supposed to create these for us,
# but I had trouble finding them # but I had trouble finding them
CCACHE_DIR=/usr/lib/ccache/compilers local ccache_dir=/usr/lib/ccache/compilers
mkdir -p $CCACHE_DIR mkdir -p $ccache_dir
ln -s /usr/bin/ccache $CCACHE_DIR/gcc ln -s /usr/bin/ccache $CCACHE_DIR/gcc
ln -s /usr/bin/ccache $CCACHE_DIR/g++ ln -s /usr/bin/ccache $CCACHE_DIR/g++
ln -s /usr/bin/ccache $CCACHE_DIR/cc ln -s /usr/bin/ccache $CCACHE_DIR/cc
ln -s /usr/bin/ccache $CCACHE_DIR/c++ ln -s /usr/bin/ccache $CCACHE_DIR/c++
export PATH=$CCACHE_DIR:$PATH export PATH=$CCACHE_DIR:$PATH
# Prove to the developer that the correct gcc is used # Prove to the developer that ccache is activated
which gcc which gcc
}
if [ $USE_CCACHE == 1 ]; then
activate_ccache
fi fi
# Unicode width, default 32 # Unicode width, default 32
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment