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 287103a7fbb3e4732ad1e4cbf5131e8dd2675782..14eba5d69a2dce1c0ab27a74dba4b0d945fe690b 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>
            Meador Inge  <meadori@codesourcery.com>
 

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index f4425608594ccaa274c8c3af0bd370c32dd290a8..743b117402b0cdea20695944f4eb263488942a28 100644 (file)
--- 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; \