--- a/configure.ac~	2021-09-08 12:45:43.000000000 +0100
+++ b/configure.ac	2021-09-08 12:47:04.446417412 +0100
@@ -1897,37 +1897,6 @@
 AC_SUBST(AGENT_LDFLAGS)
 AC_SUBST(AGENT_LIBS)
 
-if test "x$HAVE_START_GROUP" = "xyes"; then
-	LD_START_GROUP=-Wl,--start-group
-	LD_END_GROUP=-Wl,--end-group
-fi
-
-if test "x$agent2" = "xyes"; then
-	CGO_CFLAGS=$TLS_CFLAGS
-	CGO_LDFLAGS="$AGENT_LDFLAGS $LD_START_GROUP \
-		\${abs_top_builddir}/src/zabbix_agent/logfiles/libzbxlogfiles.a \
-		\${abs_top_builddir}/src/libs/zbxcomms/libzbxcomms.a \
-		\${abs_top_builddir}/src/libs/zbxcommon/libzbxcommon.a \
-		\${abs_top_builddir}/src/libs/zbxcrypto/libzbxcrypto.a \
-		\${abs_top_builddir}/src/libs/zbxsys/libzbxsys.a \
-		\${abs_top_builddir}/src/libs/zbxnix/libzbxnix.a \
-		\${abs_top_builddir}/src/libs/zbxconf/libzbxconf.a \
-		\${abs_top_builddir}/src/libs/zbxhttp/libzbxhttp.a \
-		\${abs_top_builddir}/src/libs/zbxcompress/libzbxcompress.a \
-		\${abs_top_builddir}/src/libs/zbxregexp/libzbxregexp.a \
-		\${abs_top_builddir}/src/libs/zbxsysinfo/libzbxagent2sysinfo.a \
-		\${abs_top_builddir}/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
-		\${abs_top_builddir}/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
-		\${abs_top_builddir}/src/libs/zbxsysinfo/"$ARCH"/libspechostnamesysinfo.a \
-		\${abs_top_builddir}/src/libs/zbxsysinfo/"$ARCH"/libspecsysinfo.a \
-		\${abs_top_builddir}/src/libs/zbxexec/libzbxexec.a \
-		\${abs_top_builddir}/src/libs/zbxalgo/libzbxalgo.a \
-		\${abs_top_builddir}/src/libs/zbxjson/libzbxjson.a \
-		$LIBS $AGENT_LIBS $LD_END_GROUP"
-
-	AC_SUBST(CGO_CFLAGS)
-	AC_SUBST(CGO_LDFLAGS)
-fi
 
 AC_SUBST(ZBXGET_LDFLAGS)
 AC_SUBST(ZBXGET_LIBS)
--- a/src/go/Makefile.am~	2021-08-30 08:21:19.000000000 +0100
+++ b/src/go/Makefile.am	2021-09-08 12:52:09.183862435 +0100
@@ -13,6 +13,28 @@
 GOLDFLAGS += -X ${PKG}.compileOs=${GOOS}
 GOLDFLAGS += -X ${PKG}.compileArch=${GOARCH}
 
+CGO_CFLAGS=$TLS_CFLAGS
+CGO_LIBS="$AGENT_LDFLAGS $LD_START_GROUP \
+	${top_builddir}/src/zabbix_agent/logfiles/libzbxlogfiles.a \
+	${top_builddir}/src/libs/zbxcomms/libzbxcomms.a \
+	${top_builddir}/src/libs/zbxcommon/libzbxcommon.a \
+	${top_builddir}/src/libs/zbxcrypto/libzbxcrypto.a \
+	${top_builddir}/src/libs/zbxsys/libzbxsys.a \
+	${top_builddir}/src/libs/zbxnix/libzbxnix.a \
+	${top_builddir}/src/libs/zbxconf/libzbxconf.a \
+	${top_builddir}/src/libs/zbxhttp/libzbxhttp.a \
+	${top_builddir}/src/libs/zbxcompress/libzbxcompress.a \
+	${top_builddir}/src/libs/zbxregexp/libzbxregexp.a \
+	${top_builddir}/src/libs/zbxsysinfo/libzbxagent2sysinfo.a \
+	${top_builddir}/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	${top_builddir}/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
+	${top_builddir}/src/libs/zbxsysinfo/"$ARCH"/libspechostnamesysinfo.a \
+	${top_builddir}/src/libs/zbxsysinfo/"$ARCH"/libspecsysinfo.a \
+	${top_builddir}/src/libs/zbxexec/libzbxexec.a \
+	${top_builddir}/src/libs/zbxalgo/libzbxalgo.a \
+	${top_builddir}/src/libs/zbxjson/libzbxjson.a \
+	$LIBS $AGENT_LIBS $LD_END_GROUP"
+
 AGENT_GOLDFLAGS = ${GOLDFLAGS}
 AGENT_GOLDFLAGS += -X main.confDefault=${AGENT2_CONFIG_FILE}
 AGENT_GOLDFLAGS += -X main.applicationName=zabbix_agent2
@@ -40,7 +62,7 @@
 all: build
 
 zabbix.com/cmd/zabbix_agent2:
-	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
+	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LIBS}" go build -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
 
 zabbix.com/cmd/zabbix_web_service:
 	go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service
@@ -52,7 +74,7 @@
 	rm -f bin/zabbix_agent2 bin/mock_server
 
 install-zabbix.com/cmd/zabbix_agent2:
-	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \
+	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LIBS}" GOBIN=${GOBIN} \
 		go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
 
 install-zabbix.com/cmd/zabbix_web_service:
@@ -61,5 +83,5 @@
 install-exec-local: ${INSTALL_TARGETS}
 
 check:
-	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./...
+	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LIBS}" go test ./...