* depcomp (gcc3, gcc): Don't assume $? will be set in `if'

	statement.  Report from Larry Jones.

diff --git a/ChangeLog b/ChangeLog
index 68563c6a4ea79bbc97fe12d61b7040eebb0b2360..0aa8a91cc08afe0df7beb5d4b6ac420ac0dbed7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-07  Tom Tromey  <tromey@redhat.com>
+
+       * depcomp (gcc3, gcc): Don't assume $? will be set in `if'
+       statement.  Report from Larry Jones.
+
 2001-04-07  Raja R Harinath  <harinath@cs.umn.edu>
 
        * depcomp (sgi): Fix sed expression.  Report from Robert Boehne.

diff --git a/THANKS b/THANKS
index 4ac4188d6c88bffd1a65cfdac02538c81f0a0596..709a1155aa030b155ca4ebf32c8ef13e7708f73c 100644 (file)
--- 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 c496ef0bc19b1479b053c3f98dc09fc9e29dfb9b..c61ed8137f39e7a64d94e6fa154c9b9867bfd431 100755 (executable)
--- 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 c496ef0bc19b1479b053c3f98dc09fc9e29dfb9b..c61ed8137f39e7a64d94e6fa154c9b9867bfd431 100755 (executable)
--- 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