Automagically reconfigure target directories whenever the multilib options change

diff --git a/ChangeLog b/ChangeLog
index c36b3cec1064ec01922ec44c5a5966f6433f863e..05c0a99efdefd216a557cb9121467f240abd225b 100644 (file)
--- 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 6d7199514c992fdee947699591ca64a0e4392c80..89b378129dc488cb4bc55b62a93fd5244b857d31 100644 (file)
--- 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 \