From 2b6c260d73d6cb17d85c508a646b69240bcd1f28 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Mon, 5 Jan 2004 04:37:53 +0000 Subject: [PATCH] configure.in: Use ./config.cache, not config.cache. * configure.in: Use ./config.cache, not config.cache. * configure: Regenerate. * Makefile.tpl: Special-casing not needed for GCC any more. * Makefile.in: Regenerate. From-SVN: r75413 --- ChangeLog | 5 +++++ Makefile.in | 2 +- Makefile.tpl | 2 +- configure | 4 ++-- configure.in | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93a6a94e265..a291bc4cc3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-01-04 Nathanael Nerode + * configure.in: Use ./config.cache, not config.cache. + * configure: Regenerate. + * Makefile.tpl: Special-casing not needed for GCC any more. + * Makefile.in: Regenerate. + * configure.in: Don't share a cache file for host dirs. * configure: Regenerate. diff --git a/Makefile.in b/Makefile.in index c8dad9cc65d..51d9dd4e0ce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23612,7 +23612,7 @@ configure-gcc: libsrcdir="$$s/gcc";; \ esac; \ $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} --cache-file=config.cache \ + $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 # Don't 'make all' in gcc if it's already been made by 'bootstrap'; that diff --git a/Makefile.tpl b/Makefile.tpl index af5b2910c8c..7a7e3eb0403 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1109,7 +1109,7 @@ configure-gcc: libsrcdir="$$s/gcc";; \ esac; \ $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} --cache-file=config.cache \ + $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 # Don't 'make all' in gcc if it's already been made by 'bootstrap'; that diff --git a/configure b/configure index 307d9c096ab..88d3753ed65 100755 --- a/configure +++ b/configure @@ -2590,7 +2590,7 @@ esac # Host dirs don't like to share a cache file either, horribly enough. # This seems to be due to autoconf 2.5x stupidity. -host_configargs="--cache-file=config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}" +host_configargs="--cache-file=./config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}" target_configargs=${baseargs} @@ -2624,7 +2624,7 @@ fi # directory. I think. # Pass the appropriate --host, --build, and --cache-file arguments. -target_configargs="--cache-file=config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" +target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" # provide a proper gxx_include_dir. # Note, if you change the default, make sure to fix both here and in diff --git a/configure.in b/configure.in index c84f1a624f7..b286f1aa7ef 100644 --- a/configure.in +++ b/configure.in @@ -1828,7 +1828,7 @@ esac # Host dirs don't like to share a cache file either, horribly enough. # This seems to be due to autoconf 2.5x stupidity. -host_configargs="--cache-file=config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}" +host_configargs="--cache-file=./config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}" target_configargs=${baseargs} @@ -1862,7 +1862,7 @@ fi # directory. I think. # Pass the appropriate --host, --build, and --cache-file arguments. -target_configargs="--cache-file=config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" +target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" # provide a proper gxx_include_dir. # Note, if you change the default, make sure to fix both here and in