From f44637a265a9d117629944c40b00edee817a3f3c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Oct 04 2024 16:35:54 +0000 Subject: Revert "Set _dwz_low_mem_die_limit only when a go binary is built" It was once necessary to use 'dwz --low-mem-die-limit none' to work around a bug in dwz(1) [1]. This has since been fixed, and the work around is no longer needed. eg., the toolbox RPM has never needed this in Fedora and RHEL 9, and it only needed it long ago in RHEL 8, but not anymore. This reverts commit cfd45382a2eb93556debacb352859440410848b2. [1] https://bugzilla.redhat.com/show_bug.cgi?id=995136 https://sourceware.org/bugzilla/show_bug.cgi?id=24170 https://pagure.io/go-rpm-macros/pull-request/71 --- diff --git a/rpm/macros.d/macros.go-compilers-golang b/rpm/macros.d/macros.go-compilers-golang index f3084d4..9cb24c9 100644 --- a/rpm/macros.d/macros.go-compilers-golang +++ b/rpm/macros.d/macros.go-compilers-golang @@ -82,8 +82,6 @@ EOF\ # Most of the default LDFLAGS for Fedora are not supported so we don't want # LDFLAGS to be automatically initialized with the Fedora flags. %undefine _auto_set_build_flags - # https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 - %global _dwz_low_mem_die_limit 0 %{?gobuilddir:GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} %{?gomodulesmode} \\ go build %{gobuildflags} %{?**}; }