--- spice/common/util/build.orig	Sun Jan 30 04:16:26 1994
+++ spice/common/util/build	Thu Dec 21 23:27:39 2006
@@ -96,7 +96,7 @@
 
 TMP_LEADER="${TMP_DIR}/buildl$$"
 TMP_TRAILER="${TMP_DIR}/buildt$$"
-trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15
+trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15
 echo > "${TMP_TRAILER}"
 BAD=false
 DEBUG=
@@ -171,7 +171,7 @@
 	echo Begin build on `hostname` for "${SYS_NAME}" on "${BUILD_DATE}":
 	$EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \
 		"${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \
-	| make -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
+	| make -E CC -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
 		VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}"
 	echo Done with build at `date`
 else