[gcc-6] 23/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 bc6e149ee6023f460cf891bc73332842a61e03ad
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Dec 14 13:37:36 2015 +0000

      * Fix cross-building without having the common cross libraries installed.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8528 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/rules.d/binary-libasan.mk   | 3 ++-
 debian/rules.d/binary-libgccjit.mk | 3 ++-
 debian/rules.d/binary-liblsan.mk   | 3 ++-
 debian/rules.d/binary-libtsan.mk   | 3 ++-
 debian/rules.d/binary-libubsan.mk  | 3 ++-
 debian/rules.d/binary-libvtv.mk    | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/rules.d/binary-libasan.mk b/debian/rules.d/binary-libasan.mk
index 5930f7a..e6fa756 100644
--- a/debian/rules.d/binary-libasan.mk
+++ b/debian/rules.d/binary-libasan.mk
@@ -42,7 +42,8 @@ define __do_asan
 		$(call shlibdirs_to_search, \
 			$(subst asan$(ASAN_SONAME),gcc$(GCC_SONAME),$(p_l)) \
 			$(subst asan$(ASAN_SONAME),stdc++$(CXX_SONAME),$(p_l)) \
-		,$(2))
+		,$(2)) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_l))
 	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
 
diff --git a/debian/rules.d/binary-libgccjit.mk b/debian/rules.d/binary-libgccjit.mk
index 2719c4a..47e01e0 100644
--- a/debian/rules.d/binary-libgccjit.mk
+++ b/debian/rules.d/binary-libgccjit.mk
@@ -45,7 +45,8 @@ $(binary_stamp)-libgccjit: $(install_jit_stamp)
 	dh_strip -p$(p_jitlib) --dbg-package=$(p_jitdbg)
 	$(cross_makeshlibs) dh_makeshlibs -p$(p_jitlib)
 	$(call cross_mangle_shlibs,$(p_jitlib))
-	$(ignshld)$(cross_shlibdeps) dh_shlibdeps -p$(p_jitlib)
+	$(ignshld)$(cross_shlibdeps) dh_shlibdeps -p$(p_jitlib) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_jitlib))
 	echo $(p_jitlib) $(p_jitdev) $(p_jitdbg) >> debian/arch_binaries
 
diff --git a/debian/rules.d/binary-liblsan.mk b/debian/rules.d/binary-liblsan.mk
index e7ca0bd..180aba2 100644
--- a/debian/rules.d/binary-liblsan.mk
+++ b/debian/rules.d/binary-liblsan.mk
@@ -42,7 +42,8 @@ define __do_lsan
 		$(call shlibdirs_to_search, \
 			$(subst lsan$(LSAN_SONAME),gcc$(GCC_SONAME),$(p_l)) \
 			$(subst lsan$(LSAN_SONAME),stdc++$(CXX_SONAME),$(p_l)) \
-		,$(2))
+		,$(2)) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_l))
 	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
 
diff --git a/debian/rules.d/binary-libtsan.mk b/debian/rules.d/binary-libtsan.mk
index a2b017f..d39d5a7 100644
--- a/debian/rules.d/binary-libtsan.mk
+++ b/debian/rules.d/binary-libtsan.mk
@@ -44,7 +44,8 @@ define __do_tsan
 		$(call shlibdirs_to_search, \
 			$(subst tsan$(TSAN_SONAME),gcc$(GCC_SONAME),$(p_l)) \
 			$(subst tsan$(TSAN_SONAME),stdc++$(CXX_SONAME),$(p_l)) \
-		,$(2))
+		,$(2)) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_l))
 	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
 
diff --git a/debian/rules.d/binary-libubsan.mk b/debian/rules.d/binary-libubsan.mk
index 6323bbb..b7f658a 100644
--- a/debian/rules.d/binary-libubsan.mk
+++ b/debian/rules.d/binary-libubsan.mk
@@ -42,7 +42,8 @@ define __do_ubsan
 		$(call shlibdirs_to_search, \
 			$(subst ubsan$(UBSAN_SONAME),gcc$(GCC_SONAME),$(p_l)) \
 			$(subst ubsan$(UBSAN_SONAME),stdc++$(CXX_SONAME),$(p_l)) \
-		,$(2))
+		,$(2)) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_l))
 	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
 
diff --git a/debian/rules.d/binary-libvtv.mk b/debian/rules.d/binary-libvtv.mk
index f1cc189..0dec44c 100644
--- a/debian/rules.d/binary-libvtv.mk
+++ b/debian/rules.d/binary-libvtv.mk
@@ -42,7 +42,8 @@ define __do_vtv
 		$(call shlibdirs_to_search, \
 			$(subst vtv$(VTV_SONAME),gcc$(GCC_SONAME),$(p_l)) \
 			$(subst vtv$(VTV_SONAME),stdc++$(CXX_SONAME),$(p_l)) \
-		,$(2))
+		,$(2)) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_l))
 	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
 

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