Index: kitdll/build.sh
==================================================================
--- kitdll/build.sh
+++ kitdll/build.sh
@@ -47,11 +47,11 @@
 			"${RANLIB:-ranlib}" "${archive}" || true
 		)
 	done
 
 	# Determine how we invoke a Tcl interpreter
-	for testsh in "${TCLSH_NATIVE:-false}" "${TCLKIT:-tclkit}"; do
+	for testsh in "${TCLSH_NATIVE:-false}" tclsh tclsh8.4 tclsh8.5 tclsh8.6 "${TCLKIT:-tclkit}"; do
 		if echo 'exit 0' | "${testsh}" >/dev/null 2>/dev/null; then
 			TCLSH_NATIVE="${testsh}"
 
 			break
 		fi

Index: kitsh/build.sh
==================================================================
--- kitsh/build.sh
+++ kitsh/build.sh
@@ -99,22 +99,22 @@
 	TCLKIT="${TCLKIT:-tclkit}"
 	if echo 'exit 0' | "${TCLKIT}" >/dev/null 2>/dev/null; then
 		## Install using existing Tclkit
 		### Call installer
 		echo "Running: \"${TCLKIT}\" installvfs.tcl kit starpack.vfs \"${ENABLECOMPRESSION}\""
-		"${TCLKIT}" installvfs.tcl kit starpack.vfs "${ENABLECOMPRESSION}"
+		"${TCLKIT}" installvfs.tcl kit starpack.vfs "${ENABLECOMPRESSION}" || exit 1
 	else
 		## Bootstrap (cannot cross-compile)
 		### Call installer
 		cp kit runkit
 		echo "set argv [list kit starpack.vfs {${ENABLECOMPRESSION}}]" > setup.tcl
 		echo 'if {[catch { clock seconds }]} { proc clock args { return 0 } }' >> setup.tcl
 		echo 'source installvfs.tcl' >> setup.tcl
 
 		echo 'Running: echo | ./runkit'
-		echo | ./runkit
+		echo | ./runkit || exit 1
 	fi
 
 	exit 0
 ) || exit 1
 
 exit 0