diff options
| author | Matthias Klose <doko@ubuntu.com> | 2014-03-06 14:16:49 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2014-03-06 14:16:49 +0000 |
| commit | 4973b0f955150da76d0e46f64ebe430baa279a51 (patch) | |
| tree | b1dacaa7f0cceaf27289ad362cc8608e34a1a62a /gcc | |
| parent | 3af9c5e9783dd757a944a9022bec182ced5e0596 (diff) | |
| download | gcc-4973b0f955150da76d0e46f64ebe430baa279a51.zip gcc-4973b0f955150da76d0e46f64ebe430baa279a51.tar.gz gcc-4973b0f955150da76d0e46f64ebe430baa279a51.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 287103a..14eba5d 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 f442560..743b117 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; \ |