From 2cae6c9ab54c4b01499807b3b852e0c3c2fd8682 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Mon, 3 Mar 2008 19:40:08 +0000
Subject: [PATCH] =?UTF-8?q?report=20OE=20and=20compiler=20versions=20insid?=
 =?UTF-8?q?e=20the=20build=20script=20now,=20where=20methods=20to=20query?=
 =?UTF-8?q?=20them=20are=20known=20(missing:=20bcc/dmc/msc=20compilers;=20?=
 =?UTF-8?q?additional=20OS=20info=20besides=20=E2=80=9Cuname=20-a=E2=80=9D?=
 =?UTF-8?q?=20and=20Darwin=E2=80=99s=20=E2=80=9Chwprefs=20os=5Ftype?=
 =?UTF-8?q?=E2=80=9D=20=E2=80=93=20please=20tell=20me!)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Build.sh | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/Build.sh b/Build.sh
index a3d829c..6f180a9 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.279 2008/03/01 15:07:50 tg Rel $'
+srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.280 2008/03/03 19:40:08 tg Exp $'
 #-
 # Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS
 # CPPFLAGS recognised:	MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NOPWNAM MKSH_NOVI
@@ -9,6 +9,13 @@ v() {
 	eval "$@"
 }
 
+vv() {
+	_c=$1
+	shift
+	eval '$e "\$ $*" 2>&'$h
+	eval 'eval "$@" 2>&'$h | sed "s^${_c} "
+}
+
 vq() {
 	eval "$@"
 }
@@ -114,8 +121,7 @@ ac_testn() {
 	fi
 	ac_testinit "$@" || return
 	cat >scn.c
-	eval 'v "$CC $CFLAGS $CPPFLAGS $LDFLAGS $NOWARN scn.c $LIBS" 2>&'$h | \
-	    sed 's/^/] /'
+	vv ']' "$CC $CFLAGS $CPPFLAGS $LDFLAGS $NOWARN scn.c $LIBS"
 	test x"$tcfn" = x"no" && test -f a.out && tcfn=a.out
 	test x"$tcfn" = x"no" && test -f a.exe && tcfn=a.exe
 	if test -f $tcfn; then
@@ -343,7 +349,16 @@ fi
 
 # this aids me in tracing FTBFSen without access to the buildd
 dstversion=`sed -n '/define MKSH_VERSION/s/^.*"\(.*\)".*$/\1/p' $srcdir/sh.h`
-$e "Hello from$ao $bi$srcversion$ao"
+$e "Hi from$ao $bi$srcversion$ao on:"
+case $TARGET_OS in
+Darwin)
+	vv '|' "hwprefs os_type >&2"
+	vv '|' "uname -a >&2"
+	;;
+*)
+	vv '|' "uname -a >&2"
+	;;
+esac
 $e "$bi$me: Building the MirBSD Korn Shell$ao $ui$dstversion$ao"
 
 #
@@ -387,16 +402,39 @@ cat >scn.c <<-'EOF'
 	#endif
 EOF
 ct=unknown
-eval 'v "$CPP scn.c | grep ct= | tr -d \\\\015 >x" 2>&'$h | sed 's/^/] /'
+vv ']' "$CPP scn.c | grep ct= | tr -d \\\\015 >x"
 test 1 = $h && sed 's/^/[ /' x
 eval `cat x`
 rm -f x
+cat >scn.c <<-'EOF'
+	int main(void) { return (0); }
+EOF
 case $ct in
-bcc|dmc|gcc|hpcc|icc|msc|pcc|sunpro|tcc|tendra|xlc) ;;
-*) ct=unknown ;;
+bcc|dmc)
+	;;
+gcc)
+	vv '|' "$CC -v"
+	;;
+hpcc|icc)
+	vv '|' "$CC -V"
+	;;
+msc)
+	;;
+pcc|sunpro|tcc)
+	vv '|' "$CC -v"
+	;;
+tendra)
+	vv '|' "$CC -V 2>&1 | fgrep -i -e version -e release"
+	;;
+xlc)
+	vv '|' "$CC -qversion=verbose"
+	;;
+*)
+	ct=unknown
+	;;
 esac
 $e "$bi==> which compiler seems to be used...$ao $ui$ct$ao"
-rm -f scn.c scn.o
+rm -f scn.c scn.o scn a.out a.exe
 
 case $TARGET_OS in
 HP-UX)
@@ -921,7 +959,7 @@ ac_cppflags
 test 0 = $HAVE_SYS_SIGNAME && if ac_testinit cpp_dd '' \
     'checking if the C Preprocessor supports -dD'; then
 	echo '#define foo bar' >scn.c
-	eval 'v "$CPP -dD scn.c >x" 2>&'$h | sed 's/^/] /'
+	vv ']' "$CPP -dD scn.c >x"
 	grep '#define foo bar' x >/dev/null 2>&1 && fv=1
 	rm -f scn.c x
 	ac_testdone