From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 5 Apr 2002 08:20:02 +0000 (+0200)
Subject: Makefile.in (s-mlib): Handle --disable-multilib by separate genmultilib invocation.
X-Git-Tag: releases/gcc-3.3.0~5873
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d2fb38b47c7ab90614536f4b29932f0e65bf26e;p=thirdparty%2Fgcc.git

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 ed61e4e5bc4c..c4cb7d602749 100644
--- 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 4f05c5dc07dd..6041a7f42c36 100644
--- 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