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: r208384

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4888217deb9478a32fe97c5bbe34491466ada3cf..0c4dc21a52d27fec2faaeea174fdc5d6b30c7d85 100644 (file)
--- 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>
 
        PR tree-optimization/60276

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 8b303a62e9b687f086ad94b316ce209be37dec7d..33784122cf19a2072a98e702ea4284616fd8e00b 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1827,7 +1827,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; \