From 4973b0f955150da76d0e46f64ebe430baa279a51 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Thu, 6 Mar 2014 14:16:49 +0000
Subject: [PATCH] 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
---
 gcc/ChangeLog   | 5 +++++
 gcc/Makefile.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 287103a7fbb..14eba5d69a2 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 f4425608594..743b117402b 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; \
-- 
2.11.4.GIT