From 307224f1434b8c93f35b01d1a2b28673f467d8ab Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sat, 31 Mar 2012 17:37:03 +0000
Subject: [PATCH] =?UTF-8?q?Use=20=E2=80=9Cproper=20C=20code=E2=80=9D=20for?=
 =?UTF-8?q?=20determining=20the=20compiler=20type=20even=20though=20we=20u?=
 =?UTF-8?q?se=20only=20cpp=20for=20this:=20NeXTstep=20things=20otherwise:?=
 =?UTF-8?q?=20]=20conftest.c:42:=20illegal=20external=20declaration,=20mis?=
 =?UTF-8?q?sing=20;'=20after=20`gcc'=20|=20NeXT=20Computer,=20Inc.=20versi?=
 =?UTF-8?q?on=20cc-437.2.6,=20gcc=20version=202.5.8=20|=20NeXT=20DevKit-ba?=
 =?UTF-8?q?sed=20CPP=203.1=20|=20GNU=20Objective-C=20version=202.5.8=20(80?=
 =?UTF-8?q?386,=20BSD=20syntax)=20compiled=20by=20GNU=20C=20version=202.5.?=
 =?UTF-8?q?8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Build.sh | 66 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/Build.sh b/Build.sh
index 8343fc0..82f321a 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.527 2012/03/30 10:24:45 tg Exp $'
+srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.528 2012/03/31 17:37:03 tg Exp $'
 #-
 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #		2011, 2012
@@ -404,11 +404,13 @@ You can avoid these by calling Build.sh correctly, see below.
 "
 	cat >conftest.c <<'EOF'
 #include <sys/types.h>
+const char *
 #ifdef _NETBSD_SOURCE
-ct=Ninix3
+ct="Ninix3"
 #else
-ct=Minix3
+ct="Minix3"
 #endif
+;
 EOF
 	ct=unknown
 	vv ']' "${CC-cc} -E $CFLAGS $CPPFLAGS $NOWARN conftest.c | grep ct= | tr -d \\\\015 >x"
@@ -677,61 +679,63 @@ $e $bi$me: Scanning for functions... please ignore any errors.$ao
 CPP="$CC -E"
 $e ... which compiler seems to be used
 cat >conftest.c <<'EOF'
+const char *
 #if defined(__ICC) || defined(__INTEL_COMPILER)
-ct=icc
+ct="icc"
 #elif defined(__xlC__) || defined(__IBMC__)
-ct=xlc
+ct="xlc"
 #elif defined(__SUNPRO_C)
-ct=sunpro
+ct="sunpro"
 #elif defined(__ACK__)
-ct=ack
+ct="ack"
 #elif defined(__BORLANDC__)
-ct=bcc
+ct="bcc"
 #elif defined(__WATCOMC__)
-ct=watcom
+ct="watcom"
 #elif defined(__MWERKS__)
-ct=metrowerks
+ct="metrowerks"
 #elif defined(__HP_cc)
-ct=hpcc
+ct="hpcc"
 #elif defined(__DECC) || (defined(__osf__) && !defined(__GNUC__))
-ct=dec
+ct="dec"
 #elif defined(__PGI)
-ct=pgi
+ct="pgi"
 #elif defined(__DMC__)
-ct=dmc
+ct="dmc"
 #elif defined(_MSC_VER)
-ct=msc
+ct="msc"
 #elif defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__)
-ct=adsp
+ct="adsp"
 #elif defined(__IAR_SYSTEMS_ICC__)
-ct=iar
+ct="iar"
 #elif defined(SDCC)
-ct=sdcc
+ct="sdcc"
 #elif defined(__PCC__)
-ct=pcc
+ct="pcc"
 #elif defined(__TenDRA__)
-ct=tendra
+ct="tendra"
 #elif defined(__TINYC__)
-ct=tcc
+ct="tcc"
 #elif defined(__llvm__) && defined(__clang__)
-ct=clang
+ct="clang"
 #elif defined(__NWCC__)
-ct=nwcc
+ct="nwcc"
 #elif defined(__GNUC__)
-ct=gcc
+ct="gcc"
 #elif defined(_COMPILER_VERSION)
-ct=mipspro
+ct="mipspro"
 #elif defined(__sgi)
-ct=mipspro
+ct="mipspro"
 #elif defined(__hpux) || defined(__hpua)
-ct=hpcc
+ct="hpcc"
 #elif defined(__ultrix)
-ct=ucode
+ct="ucode"
 #elif defined(__USLC__)
-ct=uslc
+ct="uslc"
 #else
-ct=unknown
+ct="unknown"
 #endif
+;
 EOF
 ct=unknown
 vv ']' "$CPP $CFLAGS $CPPFLAGS $NOWARN conftest.c | grep ct= | tr -d \\\\015 >x"
@@ -1338,7 +1342,7 @@ else
 		#define EXTERN
 		#define MKSH_INCLUDES_ONLY
 		#include "sh.h"
-		__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.527 2012/03/30 10:24:45 tg Exp $");
+		__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.528 2012/03/31 17:37:03 tg Exp $");
 		int main(void) { printf("Hello, World!\n"); return (0); }
 EOF
 	case $cm in