From 062aded9d1d7adebb5df9f7cbfb9dcbbca94da99 Mon Sep 17 00:00:00 2001
From: Michael Meissner <gnu@the-meissners.org>
Date: Thu, 11 Jul 1996 14:17:12 +0000
Subject: [PATCH] Automagically reconfigure target directories whenever the
 multilib options change

---
 ChangeLog   |  8 ++++++++
 Makefile.in | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c36b3cec106..05c0a99efde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 11 10:09:45 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in (CONFIGURE_TARGET_MODULES): Determine if the multlib
+	options have changed since the last time the subdirectory was
+	configured, and if it has, reconfigure.
+	(CLEAN_TARGET_MODULES): Delete multilib.out and tmpmulti.out, which
+	CONFIGURE_TARGET_MODULES uses to remember the old multilib options.
+
 Wed Jul 10 18:56:59 1996  Doug Evans  <dje@canuck.cygnus.com>
 
 	* Makefile.in (ALL_MODULES,CROSS_CHECK_MODULES,INSTALL_MODULES,
diff --git a/Makefile.in b/Makefile.in
index 6d7199514c9..89b378129dc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -857,6 +857,7 @@ $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
 .PHONY: $(CLEAN_TARGET_MODULES)
 $(CLEAN_TARGET_MODULES):
 	@dir=`echo $@ | sed -e 's/clean-target-//'`; \
+	rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
 	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
 	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
@@ -1012,6 +1013,18 @@ $(INSTALL_MODULES): install-dirs
 .PHONY: $(CONFIGURE_TARGET_MODULES)
 $(CONFIGURE_TARGET_MODULES):
 	@dir=`echo $@ | sed -e 's/configure-target-//'`; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+	if [ -f $(TARGET_SUBDIR)/$${dir}/multilib.out ]; then \
+	  if cmp $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out > /dev/null; then \
+	    rm -f $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+	  else \
+	    echo "Multilibs changed for $${dir}, reconfiguring"; \
+	    rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/Makefile; \
+	    mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+	fi; \
 	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
 	  true; \
 	elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
-- 
2.30.2