mkfixinc.sh: Check error code from 'cat'.

* mkfixinc.sh: Check error code from 'cat'.  Don't try running
	built fixincl program.
	* mkheaders.in: Use @SHELL@ rather than ${SHELL} to avoid picking
	up csh from user.

From-SVN: r91109
This commit is contained in:
Geoffrey Keating 2004-11-23 22:45:53 +00:00 committed by Geoffrey Keating
parent 91d9ede4ef
commit b2cfdb12c2
3 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,10 @@
2004-11-23 Geoffrey Keating <geoffk@apple.com>
* mkfixinc.sh: Check error code from 'cat'. Don't try running
built fixincl program.
* mkheaders.in: Use @SHELL@ rather than ${SHELL} to avoid picking
up csh from user.
2004-11-20 Roger Sayle <roger@eyesopen.com>
* inclhack.def (alpha_pthread_init): Fix technical problems with

View File

@ -35,8 +35,7 @@ case $machine in
;;
*)
../${build_subdir}/fixincludes/fixincl -v < /dev/null
cat < ${srcdir}/fixinc.in > ${target}
cat < ${srcdir}/fixinc.in > ${target} || exit 1
;;
esac
chmod 755 ${target}

View File

@ -77,7 +77,7 @@ rm -rf ${incdir}/*
if [ x${STMP_FIXINC} != x ] ; then
TARGET_MACHINE="${target}" target_canonical="${target}" \
MACRO_LIST="${itoolsdatadir}/macro_list" \
${SHELL} ./fixinc.sh ${incdir} \
@SHELL@ ./fixinc.sh ${incdir} \
${SYSTEM_HEADER_DIR} ${OTHER_FIXINCLUDES_DIRS}
rm -f ${incdir}/syslimits.h
if [ -f ${incdir}/limits.h ]; then
@ -90,7 +90,7 @@ fi
cp ${itoolsdatadir}/include/* ${incdir}
if [ x${STMP_FIXPROTO} != x ] ; then
mkinstalldirs="${SHELL} ${itoolsdir}/mkinstalldirs"
mkinstalldirs="@SHELL@ ${itoolsdir}/mkinstalldirs"
export FIXPROTO_DEFINES mkinstalldirs
${SHELL} fixproto ${incdir} ${incdir} ${SYSTEM_HEADER_DIR} || exit 1
@SHELL@ fixproto ${incdir} ${incdir} ${SYSTEM_HEADER_DIR} || exit 1
fi