[gcc-6] 24/401: * Fix cross-building without having the common cross libraries installed.

[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 18b9c2b514cbcb048bca11aa6c3a9f9e5ad50ba6
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Dec 16 04:14:26 2015 +0000

      * Fix cross-building without having the common cross libraries installed.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8534 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/rules.defs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/rules.defs b/debian/rules.defs
index f8a5f34..bcee7ee 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -2014,5 +2014,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/$(call mlib_to_march,$(2))/lib$(2))
+	  $(CURDIR)/$(d)/usr/$(DEB_TARGET_GNU_TYPE)/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