From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 31 Jan 2002 19:33:52 +0000 (+0000)
Subject: Update from mainline.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29af62077d5c47671a897c201624ea22e0abbd0b;p=thirdparty%2Fglibc.git

Update from mainline.
---

diff --git a/scripts/cpp b/scripts/cpp
index 4a62f1e5ae1..24112c663c0 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