Drop ccache support.

6 files changed, 17 insertions, 54 deletions

diff --git a/build.sh b/build.sh
index 8d6f2090..4e97c2ea 100755
--- a/build.sh
+++ b/build.sh
@@ -83,7 +83,6 @@ buildp_init() {
 			"${_bi_name_base}" "${ARG_THEME:-}"				\
 	  || ! ex_init_logging "${_bi_rstatus}" \$ARG_VERBOSE_TAGS "${ARG_VERBOSE}"	\
 	  || ! ex_pkg_load_vars "${_bi_rstatus}" \$ARCH \$BUILD_KIND			\
-	  || ! buildp_init_args_ccache "${_bi_rstatus}"					\
 	  || ! ex_init_prereqs "${_bi_rstatus}" "${DEFAULT_PREREQS}"			\
 	  || ! buildp_init_args "${_bi_rstatus}"					\
 	  || ! ex_init_files								\
@@ -190,21 +189,6 @@ buildp_init_args() {
 	return "${_bpia_rc}";
 };
 # }}}
-# {{{ buildp_init_args_ccache($_rstatus)
-buildp_init_args_ccache() {
-	local	_bpiac_rstatus="${1#\$}"	\
-		_bpiac_target="";
-
-	if [ "${ARG_CCACHE:+1}" = 1 ]; then
-		for _bpiac_target in CROSS HOST NATIVE SOFORT_NATIVE; do
-			eval "DEFAULT_${_bpiac_target}_CC"=\"${ARG_CCACHE} \${DEFAULT_${_bpiac_target}_CC}\";
-			eval "DEFAULT_${_bpiac_target}_CXX"=\"${ARG_CCACHE} \${DEFAULT_${_bpiac_target}_CXX}\";
-		done;
-	fi;
-
-	return 0;
-};
-# }}}
 # {{{ buildp_init_getopts_fn(...)
 buildp_init_getopts_fn() {
 	local _bpigf_rc=0 _bpigf_shiftfl=0;
@@ -227,7 +211,6 @@ buildp_init_getopts_fn() {
 
 		case "${_bpigf_opt}" in
 		--as-needed)	ARG_AS_NEEDED=1; _bpigf_shiftfl=1; ;;
-		--ccache)	ARG_CCACHE="ccache"; _bpigf_shiftfl=1; ;;
 		--debug-minipx)	ARG_DEBUG_MINIPIX=1; _bpigf_shiftfl=1; ;;
 		--help)		_bpigf_shiftfl=1; ;;
 		--reset-state)	ARG_RESET_PKG=1; _bpigf_shiftfl=1; ;;
diff --git a/etc/README.md b/etc/README.md
index e66766f6..702e4e8f 100644
--- a/etc/README.md
+++ b/etc/README.md
@@ -822,7 +822,7 @@ usage: ./build.sh [-a nt32|nt64]  [-b debug|release]    [-C dir[,..]]  [-D kind[
                   [-r [*[*[*]]]name[,..][:ALL|LAST|[^|<|<=|>|>=]step,..]]        [-R]

                   [-v] [-V [+]tag|pat[,..]]

 

-                  [--as-needed] [--ccache]  [--debug-minipix]  [--reset-state] [--roar]

+                  [--as-needed] [--debug-minipix]  [--reset-state] [--roar]

                   [--theme theme] [[=]<group>|<variable name>=<variable override>[ ..]]

 

         -a nt32|nt64        Selects 32-bit or 64-bit architecture; defaults to nt64.

@@ -900,7 +900,6 @@ usage: ./build.sh [-a nt32|nt64]  [-b debug|release]    [-C dir[,..]]  [-D kind[
 

         --as-needed         Don't build unless the midipix_build repository has received

                             new commits.

-        --ccache            Build w/ ccache(1) in $PATH.

         --debug-minipix     Don't strip(1) minipix binaries to facilitate debugging minipix.

         --reset-state       Reset package build step state on exit.

         --theme theme       Set theme.

diff --git a/etc/build.usage b/etc/build.usage
index 26a2b297..ed3c7df6 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -3,7 +3,7 @@
                   [-r [*[*[*]]]name[,..][:ALL|LAST|[^|<|<=|>|>=]step,..]]        [-R]
                   [-v] [-V [+]tag|pat[,..]]
 
-                  [--as-needed] [--ccache]  [--debug-minipix]  [--reset-state] [--roar]
+                  [--as-needed] [--debug-minipix]  [--reset-state] [--roar]
                   [--theme theme] [[=]<group>|<variable name>=<variable override>[ ..]]
 
         -a nt32|nt64        Selects 32-bit or 64-bit architecture; defaults to nt64.
@@ -82,7 +82,6 @@
 
         --as-needed         Don't build unless the midipix_build repository has received
                             new commits.
-        --ccache            Build w/ ccache(1) in $PATH.
         --debug-minipix     Don't strip(1) minipix binaries to facilitate debugging minipix.
         --reset-state       Reset package build step state on exit.
         --theme theme       Set theme.
diff --git a/etc/build.usage.short b/etc/build.usage.short
index 579c8d1f..fc966991 100644
--- a/etc/build.usage.short
+++ b/etc/build.usage.short
@@ -3,7 +3,7 @@
                   [-r [*[*[*]]]name[,..][:ALL|LAST|[^|<|<=|>|>=]step,..]]        [-R]
                   [-v] [-V [+]tag|pat[,..]]
 
-                  [--as-needed] [--ccache]  [--debug-minipix]  [--reset-state] [--roar]
+                  [--as-needed] [--debug-minipix]  [--reset-state] [--roar]
                   [--theme theme] [[=]<group>|<variable name>=<variable override>[ ..]]
 
         -a nt32|nt64        Selects 32-bit or 64-bit architecture; defaults to nt64.
diff --git a/subr.ex/ex_rtl_configure.subr b/subr.ex/ex_rtl_configure.subr
index c5f00611..bd448213 100644
--- a/subr.ex/ex_rtl_configure.subr
+++ b/subr.ex/ex_rtl_configure.subr
@@ -104,7 +104,6 @@ ex_rtl_configure() {
 # ex_rtl_configure_cmake() - configure CMake build
 # @_ar:				ar(1) command name or pathname
 # @_cc:				C compiler command name or pathname
-# @_ccache:			ccache(1) command name or pathname or ""
 # @_cmake:			CMake command name or pathname
 # @_cxx:			C++ compiler command name or pathname
 # @_ld:				ld(1) command name or pathname
@@ -134,18 +133,18 @@ ex_rtl_configure() {
 # Returns:			zero (0) on success, non-zero (>0) on failure
 #
 ex_rtl_configure_cmake() {
-	local	_ercc_ar="${1}" _ercc_cc="${2}" _ercc_ccache="${3}" _ercc_cmake="${4}"			\
-		_ercc_cxx="${5}" _ercc_ld="${6}" _ercc_pkg_config="${7}" _ercc_python="${8}"		\
-		_ercc_ranlib="${9}"									\
-		_ercc_ignored="${10}"									\
-		_ercc_build_kind="${11}" _ercc_build_type="${12}"					\
-		_ercc_cmake_args="${13}" _ercc_cmake_args_extra="${14}"					\
-		_ercc_prefix="${15}" _ercc_subdir="${16}"						\
-		_ercc_system_name="${17}" _ercc_system_processor="${18}"				\
-		_ercc_ignored="${19}"									\
-		_ercc_cflags="${20}" _ercc_cflags_extra="${21}" _ercc_cppflags="${22}"			\
-		_ercc_cppflags_extra="${23}" _ercc_cxxflags="${24}" _ercc_cxxflags_extra="${25}"	\
-		_ercc_ldflags="${26}" _ercc_ldflags_extra="${27}" _ercc_pkg_config_libdir="${28}"	\
+	local	_ercc_ar="${1}" _ercc_cc="${2}" _ercc_cmake="${3}"					\
+		_ercc_cxx="${4}" _ercc_ld="${5}" _ercc_pkg_config="${6}" _ercc_python="${7}"		\
+		_ercc_ranlib="${8}"									\
+		_ercc_ignored="${9}"									\
+		_ercc_build_kind="${10}" _ercc_build_type="${11}"					\
+		_ercc_cmake_args="${12}" _ercc_cmake_args_extra="${13}"					\
+		_ercc_prefix="${14}" _ercc_subdir="${15}"						\
+		_ercc_system_name="${16}" _ercc_system_processor="${17}"				\
+		_ercc_ignored="${18}"									\
+		_ercc_cflags="${19}" _ercc_cflags_extra="${20}" _ercc_cppflags="${21}"			\
+		_ercc_cppflags_extra="${22}" _ercc_cxxflags="${23}" _ercc_cxxflags_extra="${24}"	\
+		_ercc_ldflags="${25}" _ercc_ldflags_extra="${26}" _ercc_pkg_config_libdir="${27}"	\
 		_ercc_cmd_name="" _ercc_cmake_args_auto="" _ercc_rc=0 _ercc_vname="" _ercc_vval=""
 
 	[ "${_ercc_cflags_extra:+1}" = 1 ] && _ercc_cflags="${_ercc_cflags:+${_ercc_cflags} }${_ercc_cflags_extra}";
@@ -159,18 +158,7 @@ ex_rtl_configure_cmake() {
 	[ "${_ercc_python:+1}" = 1 ] && export PYTHON="${_ercc_python}";
 
 	for _ercc_vname in ar cc cxx ld pkg_config ranlib; do
-		case "${_ercc_vname}" in
-		cc|cxx)
-			_ercc_vname="_ercc_${_ercc_vname}";
-			if [ "${_ercc_ccache:+1}" = 1 ]; then
-				eval ${_ercc_vname}="\${${_ercc_vname}#${_ercc_ccache} }";
-			fi;
-			;;
-
-		*)
-			_ercc_vname="_ercc_${_ercc_vname}";
-			;;
-		esac;
+		_ercc_vname="_ercc_${_ercc_vname}";
 
 		if eval [ '"${'"${_ercc_vname}"':+1}"' = 1 ]\
 		&& eval [ '"${'"${_ercc_vname}"'#/}"' = '"${'"${_ercc_vname}"'}"' ]; then
@@ -183,16 +171,10 @@ ex_rtl_configure_cmake() {
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_AR=${_ercc_ar}" "|";
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_BUILD_TYPE=${_ercc_build_kind}" "|";
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_C_COMPILER=${_ercc_cc}" "|";
-	if [ "${_ercc_ccache:+1}" = 1 ]; then
-		rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_C_COMPILER_LAUNCHER=${_ercc_ccache}" "|";
-	fi;
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_C_FLAGS=${_ercc_cflags}" "|";
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_COMMAND=${_ercc_cmake}" "|";
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_CPP_FLAGS=${_ercc_cppflags}" "|";
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_CXX_COMPILER=${_ercc_cxx}" "|";
-	if [ "${_ercc_ccache:+1}" = 1 ]; then
-		rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_CXX_COMPILER_LAUNCHER=${_ercc_ccache}" "|";
-	fi;
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_CXX_FLAGS=${_ercc_cxxflags}" "|";
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_EXE_LINKER_FLAGS=${_ercc_ldflags}" "|";
 	rtl_lconcat \$_ercc_cmake_args_auto "-DCMAKE_FIND_ROOT_PATH=${_ercc_prefix}" "|";
diff --git a/subr.pkg/pkg_configure.subr b/subr.pkg/pkg_configure.subr
index 7d9ddb60..229cf583 100644
--- a/subr.pkg/pkg_configure.subr
+++ b/subr.pkg/pkg_configure.subr
@@ -55,7 +55,7 @@ pkgp_configure_cmake() {
 		esac;
 
 		ex_rtl_configure_cmake								\
-			"${PKG_AR}" "${PKG_CC}" "${ARG_CCACHE:-}" "${PKG_CMAKE}" "${PKG_CXX}"	\
+			"${PKG_AR}" "${PKG_CC}" "${PKG_CMAKE}" "${PKG_CXX}"			\
 			"${PKG_LD}" "${PKG_PKG_CONFIG}" "${PKG_PYTHON:-}" "${PKG_RANLIB}"	\
 			--									\
 			"${_ppcc_build_type}" "${PKG_BUILD_TYPE}" "${PKG_CMAKE_ARGS:-}"		\