Makefile.in (s-mlib): Handle --disable-multilib by separate genmultilib invocation.

	* Makefile.in (s-mlib): Handle --disable-multilib by separate
	genmultilib invocation.

From-SVN: r51912

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed61e4e5bc4c0f9b93d16e0ce136c80ab710ce3e..c4cb7d60274925ad5c3b3195e69a70043fd8f5ef 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-05  Jakub Jelinek  <jakub@redhat.com>
+
+       * Makefile.in (s-mlib): Handle --disable-multilib by separate
+       genmultilib invocation.
+
 2002-04-04  Richard Sandiford  <rsandifo@redhat.com>
 
        * config/mips/mips.h (CUMULATIVE_ARGS): Rename fp_regs to num_fprs

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4f05c5dc07dd55dc2eb27c126303eb90f13a0bd2..6041a7f42c36a2c17d83f896bfe0bfb0841ced20 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1036,14 +1036,18 @@ libgcc.a: $(LIBGCC_DEPS)
 # switches.
 multilib.h: s-mlib; @true
 s-mlib: $(srcdir)/genmultilib Makefile
-       $(SHELL) $(srcdir)/genmultilib \
-         "`test @enable_multilib@ != yes || echo $(MULTILIB_OPTIONS)`" \
-         "`test @enable_multilib@ != yes || echo $(MULTILIB_DIRNAMES)`" \
-         "`test @enable_multilib@ != yes || echo $(MULTILIB_MATCHES)`" \
-         "`test @enable_multilib@ != yes || echo $(MULTILIB_EXCEPTIONS)`" \
-         "`test @enable_multilib@ != yes || echo $(MULTILIB_EXTRA_OPTS)`" \
-         "`test @enable_multilib@ != yes || echo $(MULTILIB_EXCLUSIONS)`" \
-               > tmp-mlib.h
+       if test @enable_multilib@ = yes; then \
+         $(SHELL) $(srcdir)/genmultilib \
+           "$(MULTILIB_OPTIONS)" \
+           "$(MULTILIB_DIRNAMES)" \
+           "$(MULTILIB_MATCHES)" \
+           "$(MULTILIB_EXCEPTIONS)" \
+           "$(MULTILIB_EXTRA_OPTS)" \
+           "$(MULTILIB_EXCLUSIONS)" \
+           > tmp-mlib.h; \
+       else \
+         $(SHELL) $(srcdir)/genmultilib '' '' '' '' '' '' > tmp-mlib.h; \
+       fi
        $(SHELL) $(srcdir)/move-if-change tmp-mlib.h multilib.h
        $(STAMP) s-mlib