@@ -88,15 +88,15 @@
 					exit 1
 				) || continue
 
 				## Kludge to make Tcl install when cross-compiling.
 				sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
-				cat Makefile.new > Makefile
+				sed 's@^$(TCLSH)@blah@' Makefile.new > Makefile
 				rm -f Makefile.new
 
 				echo " Executing: ${MAKE:-make} install"
-				${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE:-tclsh}")" || break
+				${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE:-tclsh}")" TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE:-tclsh}")" || break
 
 				LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}"
 				LD_RUN_PATH=".:${LD_RUN_PATH}"
 				export LD_LIBRARY_PATH LD_RUN_PATH
 
@@ -172,10 +172,18 @@
 	fi
 else
 	PLATFORM="${FORCE_PLATFORM}"
 fi
 export PLATFORM
+
+# Set platform specific configuration
+case "${PLATFORM}" in
+	solaris2*)
+		LDFLAGS="${LDFLAGS} -static-libgcc"
+		export LDFLAGS
+		;;
+esac
 
 # Build all appropriate directories
 faileddirs=""
 if [ -z "${DIRS}" ]; then
 	DIRS="`echo */`"