From a095f8ab85681c446c8e481ace5a15165930b6b2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 7 Apr 2001 20:22:07 +0000 Subject: [PATCH] * depcomp (gcc3, gcc): Don't assume $? will be set in `if' statement. Report from Larry Jones. --- ChangeLog | 5 +++++ THANKS | 1 + depcomp | 10 ++++++---- lib/depcomp | 10 ++++++---- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68563c6a..0aa8a91c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-04-07 Tom Tromey + + * depcomp (gcc3, gcc): Don't assume $? will be set in `if' + statement. Report from Larry Jones. + 2001-04-07 Raja R Harinath * depcomp (sgi): Fix sed expression. Report from Robert Boehne. diff --git a/THANKS b/THANKS index 4ac4188d..709a1155 100644 --- a/THANKS +++ b/THANKS @@ -74,6 +74,7 @@ Kevin Ryde user42@zip.com.au Kevin Street street@iname.com Klaus Reichl Klaus.Reichl@alcatel.at L. Peter Deutsch ghost@aladdin.com +Larry Jones larry.jones@sdrc.com Lars Hecking lhecking@nmrc.ucc.ie Lars J. Aas larsa@sim.no Maciej Stachowiak mstachow@mit.edu diff --git a/depcomp b/depcomp index c496ef0b..c61ed813 100755 --- a/depcomp +++ b/depcomp @@ -51,9 +51,10 @@ case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! - if "$@" -MT "$object" -MF "$tmpdepfile" -MD -MP; then : + "$@" -MT "$object" -MF "$tmpdepfile" -MD -MP + stat=$? + if test $stat -ne 0; then : else - stat=$? rm -f "$tmpdepfile" exit $stat fi @@ -73,9 +74,10 @@ gcc) if test -z "$gccflag"; then gccflag=-MD, fi - if "$@" -Wp,"$gccflag$tmpdepfile"; then : + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : else - stat=$? rm -f "$tmpdepfile" exit $stat fi diff --git a/lib/depcomp b/lib/depcomp index c496ef0b..c61ed813 100755 --- a/lib/depcomp +++ b/lib/depcomp @@ -51,9 +51,10 @@ case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! - if "$@" -MT "$object" -MF "$tmpdepfile" -MD -MP; then : + "$@" -MT "$object" -MF "$tmpdepfile" -MD -MP + stat=$? + if test $stat -ne 0; then : else - stat=$? rm -f "$tmpdepfile" exit $stat fi @@ -73,9 +74,10 @@ gcc) if test -z "$gccflag"; then gccflag=-MD, fi - if "$@" -Wp,"$gccflag$tmpdepfile"; then : + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : else - stat=$? rm -f "$tmpdepfile" exit $stat fi -- 2.43.5