aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Keating <geoffk@cygnus.com>2001-12-06 01:21:03 +0000
committerGeoff Keating <geoffk@cygnus.com>2001-12-06 01:21:03 +0000
commit71ede9a8f8d6c891d706e52dc8b85c7a1623601a (patch)
tree973b38881cfe26360ce8bfa1165516ffdb388e43
parent578618390583aa9c1e3dc70b87c1f7d19478e996 (diff)
downloadglibc-71ede9a8f8d6c891d706e52dc8b85c7a1623601a.tar
glibc-71ede9a8f8d6c891d706e52dc8b85c7a1623601a.tar.gz
glibc-71ede9a8f8d6c891d706e52dc8b85c7a1623601a.tar.bz2
glibc-71ede9a8f8d6c891d706e52dc8b85c7a1623601a.zip
* scripts/cpp: Test the exit status from 'type', not 'awk'.
* scripts/cpp: Test the exit status from 'type', not 'awk'.
-rw-r--r--ChangeLog2
-rwxr-xr-xscripts/cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ca95e79c1..37cd60950b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2001-12-05 Geoff Keating <geoffk@redhat.com>
+ * scripts/cpp: Test the exit status from 'type', not 'awk'.
+
* sysdeps/powerpc/__longjmp.S: Don't restore FP registers.
* sysdeps/powerpc/fpu/__longjmp.S: Do restore FP registers.
* sysdeps/powerpc/setjmp.S: Don't save FP registers.
diff --git a/scripts/cpp b/scripts/cpp
index 4a62f1e5ae..24112c663c 100755
--- a/scripts/cpp
+++ b/scripts/cpp
@@ -1,8 +1,9 @@
#! /bin/sh
cpp=`which cpp 2>/dev/null`
if test $? -ne 0; then
- cpp=`type cpp 2>/dev/null | awk '{ print $NF }'`
- if test $? -ne 0; then
+ if type cpp 2>/dev/null >/dev/null; then
+ cpp=`type cpp 2>/dev/null | awk '{ print $NF }'`
+ else
cpp=`gcc -print-file-name=cpp 2>/dev/null`
if test $? -ne 0; then
if test -x /lib/cpp; then