[gcc-6] 74/401: - fixes for standalone gccgo build

[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 799b67616df2b5ed0efd27ea04e117058ed716f8
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Feb 6 12:55:41 2016 +0000

     - fixes for standalone gccgo build
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8652 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/rules.d/binary-go.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk
index d2fb769..7f8be66 100644
--- a/debian/rules.d/binary-go.mk
+++ b/debian/rules.d/binary-go.mk
@@ -84,7 +84,7 @@ ifeq ($(with_standalone_go),yes)
 
   ifneq ($(GFDL_INVARIANT_FREE),yes)
     files_go += \
-	$(PF)/share/man/man1/{cpp,gcc,gcov}$(pkg_ver).1
+	$(PF)/share/man/man1/{cpp,gcc,gcov,gcov-tool}$(pkg_ver).1
   endif
 
   ifeq ($(biarch64),yes)
@@ -139,7 +139,9 @@ do_gccgo = $(call __do_gccgo,lib$(1)go$(GO_SONAME),$(1))
 
 define install_gccgo_lib
 	mv $(d)/$(usr_lib$(3))/$(1).a debian/$(4)/$(gcc_lib_dir$(3))/
-	mv $(d)/$(usr_lib$(3))/$(1)libbegin.a debian/$(4)/$(gcc_lib_dir$(3))/
+	if [ -f $(d)/$(usr_lib$(3))/$(1)libbegin.a ]; then \
+	  mv $(d)/$(usr_lib$(3))/$(1)libbegin.a debian/$(4)/$(gcc_lib_dir$(3))/; \
+	fi
 	rm -f $(d)/$(usr_lib$(3))/$(1)*.{la,so}
 	dh_link -p$(4) \
 	  /$(usr_lib$(3))/$(1).so.$(2) /$(gcc_lib_dir$(3))/$(1).so
@@ -241,14 +243,14 @@ endif
 
 ifeq ($(with_standalone_go),yes)
   ifneq ($(DEB_CROSS),yes)
-	for i in gcc gcov gcc-ar gcc-nm gcc-ranlib; do \
+	for i in gcc gcov gcov-tool gcc-ar gcc-nm gcc-ranlib; do \
 	  ln -sf $$i$(pkg_ver) \
 	    $(d_go)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver); \
 	  ln -sf $$i$(pkg_ver) \
 	    $(d_go)/$(PF)/bin/$(TARGET_ALIAS)-$$i$(pkg_ver); \
 	done
     ifneq ($(GFDL_INVARIANT_FREE),yes)
-	for i in gcc gcov gcc-ar gcc-nm gcc-ranlib; do \
+	for i in gcc gcov gcov-tool gcc-ar gcc-nm gcc-ranlib; do \
 	  ln -sf gcc$(pkg_ver).1 \
 	    $(d_go)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver).1; \
 	  ln -sf $$i$(pkg_ver).1 \

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