* configure.ac: Delete config.cache files in sub-directories when
        deleting Makefiles.
        * configure: Regenerate.
This commit is contained in:
Nick Clifton 2010-02-15 10:53:35 +00:00
parent f107c370b3
commit a61421f1fb
3 changed files with 41 additions and 0 deletions

View File

@ -1,3 +1,10 @@
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.

17
configure vendored
View File

@ -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

View File

@ -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