[gcc-6] 60/401: - update cross mangler

[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 990199d10385d670081e01113501f0e4f91600b9
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Jan 21 16:47:28 2016 +0000

     - update cross mangler
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8623 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/rules.defs | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/debian/rules.defs b/debian/rules.defs
index 5c20818..22fd2d4 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1265,41 +1265,32 @@ else
 
   # libgomp -----------------
   ifeq ($(with_gomp)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       with_libgomp := yes
-    #endif
   endif
 
   # libitm -----------------
   ifeq ($(with_itm)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       with_libitm := yes
-    #endif
   endif
 
   # libatomic -----------------
   ifeq ($(with_atomic)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       with_libatomic := yes
-    #endif
   endif
 
   # libbacktrace -----------------
   ifeq ($(with_backtrace)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       # currently not a shared library
       #with_libbacktrace := yes
-    #endif
   endif
 
   # libasan -----------------
-  # asan changes soname in GCC 5
+  # asan changes soname in GCC 6
   #ifeq ($(with_asan)-$(with_common_libs),yes-yes)
-  ifeq ($(with_asan),yes)
-    #ifneq ($(DEB_CROSS),yes)
+    ifeq ($(with_asan),yes)
       with_libasan := yes
-    #endif
-  endif
+    endif
+  #endif
 
   # liblsan -----------------
   ifeq ($(with_lsan)-$(with_common_libs),yes-yes)
@@ -1310,37 +1301,27 @@ else
 
   # libtsan -----------------
   ifeq ($(with_tsan)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       with_libtsan := yes
-    #endif
   endif
 
   # libubsan -----------------
   ifeq ($(with_ubsan)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       with_libubsan := yes
-    #endif
   endif
 
   # libvtv -----------------
   ifeq ($(with_vtv)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       with_libvtv := yes
-    #endif
   endif
 
   # libcilkrts -----------------
   ifeq ($(with_cilkrts)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       with_libcilkrts := yes
-    #endif
   endif
 
   # libquadmath -----------------
   ifeq ($(with_qmath)-$(with_common_libs),yes-yes)
-    #ifneq ($(DEB_CROSS),yes)
       with_libqmath := yes
-    #endif
   endif
 
   # fixincludes -------
@@ -1970,10 +1951,13 @@ stamp-dir:
 ifeq ($(DEB_CROSS),yes)
   define cross_mangle_shlibs
 	if [ -f debian/$(1)/DEBIAN/shlibs ]; then \
-	  sed -i s/$(cross_lib_arch)//g debian/$(1)/DEBIAN/shlibs; \
+	  sed -i s/$(cross_lib_arch)/:$(DEB_TARGET_ARCH)/g debian/$(1)/DEBIAN/shlibs; \
 	fi
   endef
   define cross_mangle_substvars
+	if [ -f debian/$(1).substvars ]; then \
+	  sed -i 's/:$(DEB_TARGET_ARCH)/$(cross_lib_arch)/g' debian/$(1).substvars; \
+	fi
   endef
 else
   define cross_mangle_shlibs

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