# Use DEB_TARGET_GNU_OS in findstring since gnu is found kfreebsd-gnu
# when DEB_TARGET_GNU_SYSTEM is used!

--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -705,7 +705,7 @@
 ifneq ($(trunk_build),yes)
   go_no_cpus := $(go_no_cpus) alpha arm64
 endif
-go_no_systems := gnu kfreebsd-gnu
+go_no_systems := kfreebsd-gnu
 
 ifneq ($(with_base_only),yes)
   ifneq ($(separate_lang),yes)
@@ -715,8 +715,8 @@
 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)))
-  with_go := disabled for system $(DEB_TARGET_GNU_SYSTEM)
+ifneq (,$(findstring $(DEB_TARGET_GNU_OS),$(go_no_systems)))
+with_go := disabled for system $(DEB_TARGET_GNU_SYSTEM)
 endif
 ifeq ($(go_no_cross)-$(DEB_CROSS),yes-yes)
   with_go := disabled for cross compiler package