[gcc-7] 351/354: Update kfreebsd/go fix

[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 8309c382a0aed333bfaae5cd8ce49a71efadc62c
Author: aurel32 <aurel32 at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Nov 20 14:43:54 2017 +0000

    Update kfreebsd/go fix
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9846 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 4 ++--
 debian/rules.defs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b825f2..22fddac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,9 @@ gcc-7 (7.2.0-17) UNRELEASED; urgency=medium
   * Update sanitizer and libcc1 symbols.
   * Remove libgphobos symbols.
 
-  [ Aurelien Jarno ]
+  [ Aurelien Jarno / Svante Signell ]
   * Do not enable go on GNU/kFreeBSD, it has been wrongly enabled in
-    7.2.0-15.
+    7.2.0-15. Closes: #881656.
 
  -- Matthias Klose <doko at debian.org>  Sat, 18 Nov 2017 13:32:16 +0100
 
diff --git a/debian/rules.defs b/debian/rules.defs
index 800be89..4ec0e13 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -839,7 +839,7 @@ go_no_cpus := avr arm hppa sh4 m68k
 ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick natty oneiric))
   go_no_cpus := $(filter-out arm, $(go_no_cpus))
 endif
-go_no_systems := kfreebsd-gnu
+go_no_systems := kfreebsd
 
 ifneq ($(with_base_only),yes)
   ifneq ($(separate_lang),yes)
@@ -849,7 +849,7 @@ endif
 ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(go_no_cpus)))
   with_go := disabled for cpu $(DEB_TARGET_ARCH_CPU)
 endif
-ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(go_no_systems)))
+ifneq (,$(findstring $(DEB_TARGET_ARCH_OS),$(go_no_systems)))
   with_go := disabled for system $(DEB_TARGET_GNU_SYSTEM)
 endif
 ifeq ($(go_no_cross)-$(DEB_CROSS),yes-yes)

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