From 7e0cfa6b6896c7f4c19f91c6d5b6a261f5860b5b Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sun, 3 Jan 2016 13:51:56 +0300 Subject: [PATCH] Move ccache to hidden options (enabled by default) --- compile.sh | 1 - main.sh | 19 +++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/compile.sh b/compile.sh index ea70d9d6e9..f3e4ac552f 100755 --- a/compile.sh +++ b/compile.sh @@ -31,7 +31,6 @@ GPG_PASS="" # signing password # advanced KERNEL_KEEP_CONFIG="no" # overwrite kernel config before compilation -USE_CCACHE="yes" # use ccache for kernel compilation FBTFT="yes" # https://github.com/notro/fbtft EXTERNAL="yes" # compile extra drivers` FORCE_CHECKOUT="yes" # igre manual changes to source diff --git a/main.sh b/main.sh index 079b2904f0..93d4289ebe 100644 --- a/main.sh +++ b/main.sh @@ -30,12 +30,18 @@ for i in "$@"; do fi done -if [ "$PROGRESS_DISPLAY" = "none" ]; then +if [[ $PROGRESS_DISPLAY == none ]]; then OUTPUT_VERYSILENT=yes; -elif [ "$PROGRESS_DISPLAY" != "plain" ]; then +elif [[ $PROGRESS_DISPLAY != plain ]]; then OUTPUT_DIALOG=yes; fi -if [ "$PROGRESS_LOG_TO_FILE" != "yes" ]; then unset PROGRESS_LOG_TO_FILE; fi +if [[ $PROGRESS_LOG_TO_FILE != yes ]]; then unset PROGRESS_LOG_TO_FILE; fi + +if [[ $USE_CCACHE != no ]]; then + CCACHE=ccache +else + CCACHE="" +fi # compile.sh version checking ver1=$(grep '^# VERSION' "$SRC/compile.sh" | cut -d'=' -f2) @@ -210,13 +216,6 @@ else CTHREADS="-j${CPUS}"; fi -# Use C compiler cache -if [ "$USE_CCACHE" = "yes" ]; then - CCACHE="ccache"; -else - CCACHE=""; -fi - # display what we do if [ "$KERNEL_ONLY" == "yes" ]; then display_alert "Compiling kernel" "$BOARD" "info"