[gcc-6] 130/401: * Fix building cross mips* multilibs when not building the common libs.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 37c883862e066767e685d7fb09245797631c0f6e
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun May 1 06:15:51 2016 +0000

      * Fix building cross mips* multilibs when not building the common libs.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8819 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 1 +
 debian/rules.defs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d84958a..be2e044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gcc-6 (6.1.1-2) UNRELEASED; urgency=medium
   * Call dh_makeshlibs with the --noscripts option when building a
     cross compiler.
   * Fix building cross gnat libs when not building the common libs.
+  * Fix building cross mips* multilibs when not building the common libs.
 
  -- Matthias Klose <doko at debian.org>  Sat, 30 Apr 2016 16:38:17 +0200
 
diff --git a/debian/rules.defs b/debian/rules.defs
index b4567dc..fbddaa5 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -2034,6 +2034,6 @@ _shlibdirs = \
 	$(if $(filter yes,$(biarchsf) $(biarchhf)), \
 	  $(with_build_sysroot)/usr/$(call mlib_to_march,$(2))/lib) \
 	$(if $(filter yes, $(with_common_libs)),, \
-	  $(CURDIR)/$(d)/usr/$(DEB_TARGET_GNU_TYPE)/lib$(2) \
+	  $(CURDIR)/$(d)/$(usr_lib$(2)) \
 	  $(CURDIR)/$(d)/usr/$(call mlib_to_march,$(2))/lib)
 shlibdirs_to_search = -l$(subst $(SPACE),:,$(foreach d,$(_shlibdirs),$(d)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git