--- Makefile.orig	2008-11-04 22:36:26.000000000 +0100
+++ Makefile	2008-11-04 22:40:08.000000000 +0100
@@ -1,3 +1,5 @@
+CC=`head -n 1 conf-cc`
+
 default: it
 
 clean:
@@ -108,7 +110,7 @@
 hasrpcc.h load rts rts.exp speed systype
 	rm -f sysdeps
 	echo nistp224 0.75 >> sysdeps
-	gcc --version >> sysdeps
+	${CC} --version >> sysdeps
 	cat systype compile load >> sysdeps
 	grep sysdep hasgethr.h >> sysdeps
 	grep sysdep hasrdtsc.h >> sysdeps
--- find-systype.sh.orig	2008-11-04 22:35:18.000000000 +0100
+++ find-systype.sh	2008-11-04 22:36:51.000000000 +0100
@@ -79,8 +79,8 @@
     ;;
   esac
 else
-  gcc -c trycpp.c
-  gcc -o trycpp trycpp.o
+  ${CC} -c trycpp.c
+  ${CC} -o trycpp trycpp.o
   case `./trycpp` in
   nextstep)
     oper="nextstep-`hostinfo | sed -n 's/^[ 	]*NeXT Mach \([^:]*\):.*$/\1/p'`"
--- print-cc.sh.orig	2008-11-04 22:34:51.000000000 +0100
+++ print-cc.sh	2008-11-04 22:35:04.000000000 +0100
@@ -1,46 +1,5 @@
 cc="`head -n 1 conf-cc`"
 systype="`cat systype`"
 
-
-gcc -c trycpp.c -malign-double >/dev/null 2>&1 \
-&& gccad="-malign-double"
-
-gcc -c trycpp.c -mcpu=ultrasparc >/dev/null 2>&1 \
-&& gccus="-mcpu=ultrasparc"
-
-gcc -c trycpp.c -mcpu=powerpc >/dev/null 2>&1 \
-&& gccpp="-mcpu=powerpc"
-
-gcc -c trycpp.c -mcpu=21164 >/dev/null 2>&1 \
-&& gcc21="-mcpu=21164"
-
-rm -f trycpp.o
-
-
-gccbase="gcc -fomit-frame-pointer -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings"
-
-
-case "$cc:$systype" in
-  auto:*:i386-*:*)
-    cc="$gccbase -O1 $gccad"
-    ;;
-  auto:*:sparc-*:*:*:*)
-    cc="$gccbase -O1 $gccus"
-    ;;
-  auto:*:ppc-*:*:*:*)
-    cc="$gccbase -O2 $gccpp"
-    ;;
-  auto:*:alpha-*:*:*:*)
-    cc="$gccbase -O2 $gcc21"
-    ;;
-  auto:aix-*:-:-:*:-)
-    cc="$gccbase -O2 $gccpp"
-    ;;
-  auto:*)
-    cc="$gccbase -O2"
-    ;;
-esac
-
-
 cat warn-auto.sh
 echo exec "$cc" '-c ${1+"$@"}'