aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
Diffstat (limited to 'libio')
-rw-r--r--libio/ChangeLog5
-rw-r--r--libio/configure.in4
2 files changed, 8 insertions, 1 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog
index 15095d8..aa546a4 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-12 Jason Merrill <jason@yorick.cygnus.com>
+
+ * configure.in (compiler_name): Don't do the skip-this-dir thing
+ if we're reconfiguring.
+
1999-04-29 Nathan Sidwell <nathan@acm.org>
* streambuf.h (ios::~ios): Use operator delete[] to remove _arrays.
diff --git a/libio/configure.in b/libio/configure.in
index b2568e5..084e901 100644
--- a/libio/configure.in
+++ b/libio/configure.in
@@ -18,9 +18,11 @@ esac
# does, we do not build anything. Note, $r is set by the top-level Makefile.
# Note that when we look for the compiler, we search both with and without
# extension to handle cross and canadian cross builds.
+# Note that if $norecursion is set we're being called from config.status,
+# so don't check for the compiler; we might be doing a make clean.
compiler_name=cc1plus
rm -f skip-this-dir
-if test -n "$r"; then
+if test -n "$r" && [ -z "$norecursion" ] ; then
if test -d "$r"/gcc; then
if test -f "$r"/gcc/$compiler_name \
|| test -f "$r"/gcc/$compiler_name$EXEEXT; then