From 29b160bd76dc5bebdd70af0be1fcc1572556a113 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Jan 22 2022 21:55:35 +0000 Subject: Fix gotest ldflags invocation --- diff --git a/rpm/macros.d/macros.go-rpm b/rpm/macros.d/macros.go-rpm index f773f34..71b7f54 100644 --- a/rpm/macros.d/macros.go-rpm +++ b/rpm/macros.d/macros.go-rpm @@ -350,7 +350,8 @@ local function process(suffix) zsuffix = "-z " .. suffix .. " " end print(rpm.expand('%goenv ' .. zsuffix .. myenvflags .. '\\n' .. - '%{?currentgoldflags:LDFLAGS="${LDFLAGS} %{?currentgoldflags}" }' .. + '%{?currentgoldflags:LDFLAGS="%{golang_filter_ldflags} ' .. + '%{?currentgoldflags}" }' .. '%{?gotestflags:GO_TEST_FLAGS="%{gotestflags}" }' .. '%{?gotestextldflags:GO_TEST_EXT_LD_FLAGS="%{gotestextldflags}" }' .. 'go-rpm-integration check ' .. mycheckflags .. '\\n'))