autoscan for c præprocessor now prefers $CPP to "$CC -E"
This commit is contained in:
parent
da03ad5be2
commit
478374ba3b
29
Build.sh
29
Build.sh
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# $MirOS: src/bin/mksh/Build.sh,v 1.118 2007/01/17 17:03:59 tg Exp $
|
# $MirOS: src/bin/mksh/Build.sh,v 1.119 2007/01/17 17:08:34 tg Exp $
|
||||||
#-
|
#-
|
||||||
# Environment: CC, CFLAGS, CPP, CPPFLAGS, LDFLAGS, LIBS, NOWARN, NROFF
|
# Environment: CC, CFLAGS, CPP, CPPFLAGS, LDFLAGS, LIBS, NOWARN, NROFF
|
||||||
# With -x (cross compile): TARGET_OS (default: uname -s)
|
# With -x (cross compile): TARGET_OS (default: uname -s)
|
||||||
@ -116,8 +116,7 @@ if test -d mksh; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# XXX autoconf for gcc:-cc and $CPP
|
: ${CPP=false} ${CC=gcc} ${NROFF=nroff}
|
||||||
: ${CC=gcc} ${NROFF=nroff}
|
|
||||||
curdir=`pwd` srcdir=`dirname "$0"` check_categories=pdksh
|
curdir=`pwd` srcdir=`dirname "$0"` check_categories=pdksh
|
||||||
echo | $NROFF -v 2>&1 | grep GNU >/dev/null 2>&1 && NROFF="$NROFF -c"
|
echo | $NROFF -v 2>&1 | grep GNU >/dev/null 2>&1 && NROFF="$NROFF -c"
|
||||||
|
|
||||||
@ -348,23 +347,25 @@ EOF
|
|||||||
if test 1 = $NEED_MKSH_SIGNAME; then
|
if test 1 = $NEED_MKSH_SIGNAME; then
|
||||||
$e "... checking how to run the C Preprocessor"
|
$e "... checking how to run the C Preprocessor"
|
||||||
rm -f x
|
rm -f x
|
||||||
( ( echo '#if (23 * 2 - 2) == (fnord + 2)'
|
if test x"$CPP" != x"false"; then
|
||||||
echo mksh_rules: fnord
|
|
||||||
echo '#endif'
|
|
||||||
) | v "$CC -E - $CPPFLAGS -Dfnord=42 >x" ) 2>&$h | sed 's/^/] /'
|
|
||||||
if grep '^mksh_rules:.*42' x >/dev/null 2>&1; then
|
|
||||||
CPP="$CC -E -"
|
|
||||||
else
|
|
||||||
rm -f x
|
|
||||||
( ( echo '#if (23 * 2 - 2) == (fnord + 2)'
|
( ( echo '#if (23 * 2 - 2) == (fnord + 2)'
|
||||||
echo mksh_rules: fnord
|
echo mksh_rules: fnord
|
||||||
echo '#endif'
|
echo '#endif'
|
||||||
) | v "$CPP $CPPFLAGS -Dfnord=42 >x" ) 2>&$h | sed 's/^/] /'
|
) | v "$CPP $CPPFLAGS -Dfnord=42 >x" ) 2>&$h | sed 's/^/] /'
|
||||||
grep '^mksh_rules:.*42' x >/dev/null 2>&1 || CPP=no
|
grep '^mksh_rules:.*42' x >/dev/null 2>&1 || CPP=false
|
||||||
|
rm -f x
|
||||||
|
fi
|
||||||
|
if test x"$CPP" = x"false"; then
|
||||||
|
CPP="$CC -E"
|
||||||
|
( ( echo '#if (23 * 2 - 2) == (fnord + 2)'
|
||||||
|
echo mksh_rules: fnord
|
||||||
|
echo '#endif'
|
||||||
|
) | v "$CPP $CPPFLAGS -Dfnord=42 >x" ) 2>&$h | sed 's/^/] /'
|
||||||
|
grep '^mksh_rules:.*42' x >/dev/null 2>&1 || CPP=false
|
||||||
|
rm -f x
|
||||||
fi
|
fi
|
||||||
rm -f x
|
|
||||||
$e "$bi==> checking how to run the C Preprocessor...$ao $ui$CPP$ao"
|
$e "$bi==> checking how to run the C Preprocessor...$ao $ui$CPP$ao"
|
||||||
test x"$CPP" = x"no" && exit 1
|
test x"$CPP" = x"false" && exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$e ... done.
|
$e ... done.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user