Index: server/buildpkgs/common.sh
==================================================================
--- server/buildpkgs/common.sh
+++ server/buildpkgs/common.sh
@@ -10,12 +10,14 @@
 			continue
 		fi
 
 		source "${envfile}"
 
-		break
+		return 0
 	done
+
+	return 1
 }
 
 function setup_tcl85 () {
 	setup_tcl 8.5 8.4
 }

Index: server/buildpkgs/tcc4tcl/build.sh
==================================================================
--- server/buildpkgs/tcc4tcl/build.sh
+++ server/buildpkgs/tcc4tcl/build.sh
@@ -12,10 +12,13 @@
 source ../common.sh
 
 # Do not build if the "tcl" platform has been requested
 not_platforms 'tcl'
 
+# Requires Tcl 8.5 or newer
+setup_tcl 8.5 8.6 || exit 1
+
 # Download source
 download_src
 
 # Extract package
 (
@@ -45,8 +48,8 @@
 
 	${MAKE:-make} PACKAGE_INSTALL_DIR="${PLATDIR}" install || exit 1
 ) || exit 1
 
 # Create metadata
-../create_teapot "${PLATDIR}/teapot.txt" "tcc4tcl" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.4" "tcc4tcl provides a Tcl binding to the TinyCC compiler. It allows dynamic compilation of C code from within a Tcl interpreter." "${LICENSE}"
+../create_teapot "${PLATDIR}/teapot.txt" "tcc4tcl" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.5" "tcc4tcl provides a Tcl binding to the TinyCC compiler. It allows dynamic compilation of C code from within a Tcl interpreter." "${LICENSE}"
 
 exit 0