aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xconfigure17
-rw-r--r--configure.ac17
3 files changed, 41 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d130d2..6aac96e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2010-02-15 Nick Clifton <nickc@redhat.com>
+ PR 11238
+ * configure.ac: Delete config.cache files in sub-directories when
+ deleting Makefiles.
+ * configure: Regenerate.
+
+2010-02-15 Nick Clifton <nickc@redhat.com>
+
* configure.ac: Sync from gcc.
* configure: Regenerate.
diff --git a/configure b/configure
index fd65298..1f58ba3 100755
--- a/configure
+++ b/configure
@@ -7606,6 +7606,12 @@ for module in ${build_configdirs} ; do
echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
rm -f ${build_subdir}/${module}/Makefile
fi
+ # PR 11238: Also remove config.cache files.
+ if test -z "${no_recursion}" \
+ && test -f ${build_subdir}/${module}/config.cache; then
+ echo 1>&2 "*** removing ${build_subdir}/${module}/config.cache to allow reconfigure"
+ rm -f ${build_subdir}/${module}/config.cache
+ fi
extrasub_build="$extrasub_build
/^@if build-$module\$/d
/^@endif build-$module\$/d
@@ -7621,6 +7627,11 @@ for module in ${configdirs} ; do
rm -f ${file}
fi
done
+ # PR 11238: Also remove config.cache files.
+ if test -f ${module}/config.cache; then
+ echo 1>&2 "*** removing ${module}/config.cache to allow reconfigure"
+ rm -f ${module}/config.cache
+ fi
fi
extrasub_host="$extrasub_host
/^@if $module\$/d
@@ -7635,6 +7646,12 @@ for module in ${target_configdirs} ; do
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
rm -f ${target_subdir}/${module}/Makefile
fi
+ # PR 11238: Also remove config.cache files.
+ if test -z "${no_recursion}" \
+ && test -f ${target_subdir}/${module}/config.cache; then
+ echo 1>&2 "*** removing ${target_subdir}/${module}/config.cache to allow reconfigure"
+ rm -f ${target_subdir}/${module}/config.cache
+ fi
# We only bootstrap target libraries listed in bootstrap_target_libs.
case $bootstrap_target_libs in
diff --git a/configure.ac b/configure.ac
index 3464166..371b6e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2710,6 +2710,12 @@ for module in ${build_configdirs} ; do
echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
rm -f ${build_subdir}/${module}/Makefile
fi
+ # PR 11238: Also remove config.cache files.
+ if test -z "${no_recursion}" \
+ && test -f ${build_subdir}/${module}/config.cache; then
+ echo 1>&2 "*** removing ${build_subdir}/${module}/config.cache to allow reconfigure"
+ rm -f ${build_subdir}/${module}/config.cache
+ fi
extrasub_build="$extrasub_build
/^@if build-$module\$/d
/^@endif build-$module\$/d
@@ -2725,6 +2731,11 @@ for module in ${configdirs} ; do
rm -f ${file}
fi
done
+ # PR 11238: Also remove config.cache files.
+ if test -f ${module}/config.cache; then
+ echo 1>&2 "*** removing ${module}/config.cache to allow reconfigure"
+ rm -f ${module}/config.cache
+ fi
fi
extrasub_host="$extrasub_host
/^@if $module\$/d
@@ -2739,6 +2750,12 @@ for module in ${target_configdirs} ; do
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
rm -f ${target_subdir}/${module}/Makefile
fi
+ # PR 11238: Also remove config.cache files.
+ if test -z "${no_recursion}" \
+ && test -f ${target_subdir}/${module}/config.cache; then
+ echo 1>&2 "*** removing ${target_subdir}/${module}/config.cache to allow reconfigure"
+ rm -f ${target_subdir}/${module}/config.cache
+ fi
# We only bootstrap target libraries listed in bootstrap_target_libs.
case $bootstrap_target_libs in