From: Matthias Klose <doko@ubuntu.com>
Date: Thu, 6 Mar 2014 14:16:49 +0000 (+0000)
Subject: Makefile.in (s-mlib): Only pass MULTIARCH_DIRNAME if MULTILIB_OSDIRNAMES is not defined.
X-Git-Tag: releases/gcc-4.9.0~553
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4973b0f955150da76d0e46f64ebe430baa279a51;p=thirdparty%2Fgcc.git

Makefile.in (s-mlib): Only pass MULTIARCH_DIRNAME if MULTILIB_OSDIRNAMES is not defined.

2014-03-06  Matthias Klose  <doko@ubuntu.com>

        * Makefile.in (s-mlib): Only pass MULTIARCH_DIRNAME if
        MULTILIB_OSDIRNAMES is not defined.

From-SVN: r208383
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 287103a7fbb3..14eba5d69a2d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-06  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.in (s-mlib): Only pass MULTIARCH_DIRNAME if
+	MULTILIB_OSDIRNAMES is not defined.
+
 2014-03-06  Jakub Jelinek  <jakub@redhat.com>
 	    Meador Inge  <meadori@codesourcery.com>
 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index f4425608594c..743b117402b0 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1838,7 +1838,7 @@ s-mlib: $(srcdir)/genmultilib Makefile
 	    "$(MULTILIB_EXCLUSIONS)" \
 	    "$(MULTILIB_OSDIRNAMES)" \
 	    "$(MULTILIB_REQUIRED)" \
-	    "$(MULTIARCH_DIRNAME)" \
+	    "$(if $(MULTILIB_OSDIRNAMES),,$(MULTIARCH_DIRNAME))" \
 	    "$(MULTILIB_REUSE)" \
 	    "@enable_multilib@" \
 	    > tmp-mlib.h; \