From d960c105fc8a11322dbca07b4dd65937851916c2 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 12 May 1999 08:39:23 +0000 Subject: configure.in (compiler_name): Don't do the skip-this-dir thing if we're reconfiguring. * configure.in (compiler_name): Don't do the skip-this-dir thing if we're reconfiguring. From-SVN: r26899 --- libstdc++/ChangeLog | 5 +++++ libstdc++/configure.in | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'libstdc++') diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index a75920e12ef..731a4404a2e 100644 --- a/libstdc++/ChangeLog +++ b/libstdc++/ChangeLog @@ -1,3 +1,8 @@ +1999-05-12 Jason Merrill + + * configure.in (compiler_name): Don't do the skip-this-dir thing + if we're reconfiguring. + 1999-05-07 Ulrich Drepper * std/bastring.h (class basic_string::Rep): Make release member diff --git a/libstdc++/configure.in b/libstdc++/configure.in index 0f556cac551..c0c701398f1 100644 --- a/libstdc++/configure.in +++ b/libstdc++/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 -- cgit v1.2.1