From bae203e7ff4da8f9fdeb11233de73ad300d412b6 Mon Sep 17 00:00:00 2001
From: aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 24 Jul 2000 04:29:33 +0000
Subject: [PATCH] * configure.in: Use the same cache file for all target libs.
* config-ml.in: But different cache files per multilib variant.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35219 138bc75d-0d04-0410-961f-82ee72b054a4
---
ChangeLog | 5 +++++
config-ml.in | 2 +-
configure.in | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d0f664a00dc3..124aff4a866b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-24 Alexandre Oliva <aoliva@redhat.com>
+
+ * configure.in: Use the same cache file for all target libs.
+ * config-ml.in: But different cache files per multilib variant.
+
2000-07-23 Michael Sokolov <msokolov@ivan.Harhan.ORG>
* configure (topsrcdir): Don't use dirname.
diff --git a/config-ml.in b/config-ml.in
index 60b1d2c1f949..e5ca10ec1db1 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -742,7 +742,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
cd ${ml_dir}/${ml_libdir}
if [ -f ${ml_newsrcdir}/configure ]; then
- ml_recprog=${ml_newsrcdir}/configure
+ ml_recprog="${ml_newsrcdir}/configure --cache-file=../config.cache"
fi
# find compiler flag corresponding to ${ml_dir}
diff --git a/configure.in b/configure.in
index e4ed2b23ab06..44d734031f36 100644
--- a/configure.in
+++ b/configure.in
@@ -1216,7 +1216,7 @@ else
gxx_include_dir=${gxx_include_dir}
fi
-targargs="--host=${target_alias} --build=${build_alias} ${targargs}"
+targargs="--cache-file=../config.cache --host=${target_alias} --build=${build_alias} ${targargs}"
sed -e "s:^TARGET_CONFIGDIRS[ ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
-e "s%^CONFIG_ARGUMENTS[ ]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \
-e "s%^TARGET_SUBDIR[ ]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \
--
GitLab