diff options
author | Geoffrey Keating <geoffk@apple.com> | 2004-11-23 22:45:53 +0000 |
---|---|---|
committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2004-11-23 22:45:53 +0000 |
commit | b2cfdb12c2501e363ca16a497df70c7459da3ef4 (patch) | |
tree | c31fbecbc19ab52c650685fc08553ebf1c2f306f /fixincludes | |
parent | 91d9ede4ef0bd904b21dd49621f3df13be8c9254 (diff) | |
download | gcc-b2cfdb12c2501e363ca16a497df70c7459da3ef4.zip gcc-b2cfdb12c2501e363ca16a497df70c7459da3ef4.tar.gz gcc-b2cfdb12c2501e363ca16a497df70c7459da3ef4.tar.bz2 |
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
Diffstat (limited to 'fixincludes')
-rw-r--r-- | fixincludes/ChangeLog | 7 | ||||
-rwxr-xr-x | fixincludes/mkfixinc.sh | 3 | ||||
-rw-r--r-- | fixincludes/mkheaders.in | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 25a4e7f..9cc3244 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -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 diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh index d8b55c1..ef048f7 100755 --- a/fixincludes/mkfixinc.sh +++ b/fixincludes/mkfixinc.sh @@ -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} diff --git a/fixincludes/mkheaders.in b/fixincludes/mkheaders.in index 7216e9a..8330ac4 100644 --- a/fixincludes/mkheaders.in +++ b/fixincludes/mkheaders.in @@ -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 |