summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-29 13:58:15 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-05-29 13:58:50 (GMT)
commit70b930db38cba1b601bcb821b8b10e92e8c8b5ed (patch)
tree959add1cb72e6b394017135f7fd13e780b86b927
parent4e890800eb79cfa758c27ae55eb5ffe10b19fcb3 (diff)
parent1f994d9fdcf70ea16a5a3812d2151d9b7f27f784 (diff)
downloadCMake-70b930db38cba1b601bcb821b8b10e92e8c8b5ed.zip
CMake-70b930db38cba1b601bcb821b8b10e92e8c8b5ed.tar.gz
CMake-70b930db38cba1b601bcb821b8b10e92e8c8b5ed.tar.bz2
Merge topic 'bootstrap_ccache_tweak'
1f994d9fdc bootstrap: Use ccache in script-generated makefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2107
-rwxr-xr-xbootstrap10
1 files changed, 6 insertions, 4 deletions
diff --git a/bootstrap b/bootstrap
index 6604f54..0aa600d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1250,6 +1250,12 @@ else
echo "${cmake_cxx_compiler} does not have <ext/stdio_filebuf.h>"
fi
+if [ -n "${cmake_ccache_enabled}" ]; then
+ echo "Building CMake with ccache"
+ cmake_c_compiler="ccache ${cmake_c_compiler}"
+ cmake_cxx_compiler="ccache ${cmake_cxx_compiler}"
+fi
+
# Just to be safe, let us store compiler and flags to the header file
cmake_bootstrap_version='$Revision$'
@@ -1536,10 +1542,6 @@ cd "${cmake_binary_dir}"
# build with same compiler and make
CC="${cmake_c_compiler}"
CXX="${cmake_cxx_compiler}"
-if [ -n "${cmake_ccache_enabled}" ]; then
- CC="ccache ${CC}"
- CXX="ccache ${CXX}"
-fi
MAKE="${cmake_make_processor}"
export CC
export CXX