[gcc-6] 383/401: * Fix libcc1.so symlink for cross compilers. Addresses: #856875.

[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 929f8e9549574e78743f5b262576bc7c92eb1d9b
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Mar 6 13:56:23 2017 +0000

      * Fix libcc1.so symlink for cross compilers. Addresses: #856875.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9339 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             |  1 +
 debian/rules.d/binary-gcc.mk |  7 ++++---
 debian/rules.defs            | 13 +++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8041673..c0b0a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gcc-6 (6.3.0-9) UNRELEASED; urgency=medium
       PR target/79749 (sparc), PR target/79261 (PPC), PR fortran/78474,
       PR fortran/78331.
   * gcj-6: Fix ecj1 symlink on i386. Closes: #856903.
+  * Fix libcc1.so symlink for cross compilers. Addresses: #856875.
 
  -- Matthias Klose <doko at debian.org>  Sun, 05 Mar 2017 11:37:13 +0100
 
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index e521c79..6b5acff 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -42,7 +42,7 @@ files_gcc = \
 	$(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \
 		&& echo $(gcc_lib_dir)/SYSCALLS.c.X)
 
-ifeq ($(with_cc1),yes)
+ifeq ($(with_libcc1_plugin),yes)
     files_gcc += \
 	$(gcc_lib_dir)/plugin/libcc1plugin.so{,.0,.0.0.0}
 endif
@@ -127,9 +127,10 @@ ifeq ($(with_mpx),yes)
 		$(d_gcc)/$(docdir)/$(p_xbase)/mpx/changelog
 endif
 ifeq ($(with_cc1),yes)
-	rm -f $(d)/$(usr_lib)/libcc1.so
+	rm -f $(d)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libcc1.so
 	dh_link -p$(p_gcc) \
-		/$(usr_lib)/libcc1.so.$(CC1_SONAME) /$(gcc_lib_dir)/libcc1.so
+	    /$(PF)/lib/$(DEB_HOST_MULTIARCH)/libcc1.so.$(CC1_SONAME) \
+	    /$(gcc_lib_dir)/libcc1.so
 endif
 
 	$(dh_compat2) dh_movefiles -p$(p_gcc) $(files_gcc)
diff --git a/debian/rules.defs b/debian/rules.defs
index 6543efc..47b1ea0 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -616,15 +616,20 @@ endif
 
 with_cc1 := yes
 with_cc1 := $(call envfilt, cc1, , , $(with_cc1))
+
 ifeq ($(with_cc1),yes)
-  ifneq ($(DEB_CROSS),yes)
-    ifeq ($(with_common_libs),yes)
-      with_libcc1 := yes
-    endif
+  ifeq ($(with_common_libs),yes)
+    with_libcc1 := yes
   endif
+  with_libcc1_plugin := yes
 endif
+
 ifneq (,$(with_rtlibs))
   with_libcc1 := disabled for rtlibs stage
+  with_libcc1_plugin := disabled for rtlibs stage
+endif
+ifneq (,$(findstring build-cross, $(build_type)))
+  with_libcc1 := disabled for cross builds
 endif
 
 # Build all packages needed for C development

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