[gcc-7] 235/354: Stop symlinking gcc-7-7 -> gcc-7, see #856274 and #814977.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 77cb34d6e4e258abaa785afca4597936a42a0b01
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Jun 28 11:52:10 2017 +0000

    Stop symlinking gcc-7-7 -> gcc-7, see #856274 and #814977.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9552 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             | 1 +
 debian/rules.d/binary-ada.mk | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d221e34..686223b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ gcc-7 (7.1.0-7ubuntu1) UNRELEASED; urgency=medium
   [ Nicolas Boulenguez ]
   * Update ada/confirm_debian_bugs.py for gcc-7.
   * Drop ada-driver-check.diff, the problem is unreproducible.
+  * Stop symlinking gcc-7-7 -> gcc-7. See #856274 and #814977.
 
  -- Matthias Klose <doko at debian.org>  Tue, 27 Jun 2017 13:19:14 +0200
 
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 66fe823..46abc53 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -236,11 +236,6 @@ endif
 	done
 
 ifneq (,$(filter $(build_type), build-native cross-build-native))
-	: # see #814977, work around it for now ...
-	ln -sf gcc$(pkg_ver) $(d_gnat)/$(PF)/bin/gcc$(pkg_ver)$(pkg_ver)
-endif
-
-ifneq (,$(filter $(build_type), build-native cross-build-native))
 	: # still ship the unversioned prefixed names in the gnat package.
 	for i in $(GNAT_TOOLS); do \
 	  ln -sf $(cmd_prefix)$$i$(pkg_ver) \

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