From: Jeffrey A Law <law@cygnus.com>
Date: Wed, 8 Mar 2000 05:07:48 +0000 (+0000)
Subject: inclhack.tpl: Test for directory before trying to cd into it.
X-Git-Tag: prereleases/gcc-2.95.3-test1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1950cd3a8614dd36d28a3d3a461477767d50565d;p=thirdparty%2Fgcc.git

inclhack.tpl: Test for directory before trying to cd into it.

Wed Jan 19 20:39:17 2000  Jim Wilson  <wilson@cygnus.com>

	* fixinc/inclhack.tpl: Test for directory before trying to cd into it.
	* fixinc/fixincl.sh, fixinc/inclhack.sh: Regenerate.

From-SVN: r32407
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6bf7f288ae45..d0d2174ba43a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Tue Mar  7 21:41:17 2000  Jeffrey A Law  (law@cygnus.com)
 
+	Wed Jan 19 20:39:17 2000  Jim Wilson  <wilson@cygnus.com>
+	* fixinc/inclhack.tpl: Test for directory before trying to cd into it.
+	* fixinc/fixincl.sh, fixinc/inclhack.sh: Regenerate.
+
 	Tue Oct 12 09:45:19 1999  Jonathan Larmour  <jlarmour@cygnus.co.uk>
 	* config/rs6000/eabi-ctors.c (__do_global_ctors): Run through
 	__CTOR_LIST__ in opposite order, which is the correct order for sorted
diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index 56eebd60bc4c..05722bdff012 100755
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -125,7 +125,12 @@ for INPUT in ${INPUTLIST} ; do
 
 cd ${ORIGDIR}
 
-cd ${INPUT} || continue
+# This originally used cd || continue, however, that does not work with the
+# Solaris2 /bin/sh.
+if [ ! -d ${INPUT} ]; then
+  continue
+fi
+cd ${INPUT}
 INPUT=`${PWDCMD}`
 
 #
diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index f6fab88798be..c2d85b1a4bfb 100755
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -123,7 +123,12 @@ for INPUT in ${INPUTLIST} ; do
 
 cd ${ORIGDIR}
 
-cd ${INPUT} || continue
+# This originally used cd || continue, however, that does not work with the
+# Solaris2 /bin/sh.
+if [ ! -d ${INPUT} ]; then
+  continue
+fi
+cd ${INPUT}
 INPUT=`${PWDCMD}`
 
 #
diff --git a/gcc/fixinc/inclhack.tpl b/gcc/fixinc/inclhack.tpl
index 587a8e531438..2c76483ba628 100644
--- a/gcc/fixinc/inclhack.tpl
+++ b/gcc/fixinc/inclhack.tpl
@@ -118,7 +118,12 @@ for INPUT in ${INPUTLIST} ; do
 
 cd ${ORIGDIR}
 
-cd ${INPUT} || continue
+# This originally used cd || continue, however, that does not work with the
+# Solaris2 /bin/sh.
+if [ ! -d ${INPUT} ]; then
+  continue
+fi
+cd ${INPUT}
 INPUT=`${PWDCMD}`
 
 #