From 89992b35ca1a72cafb54ce3bfcaa08abc3db7346 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 23 Dec 2023 22:17:12 +0000 Subject: [PATCH] Build contrib filters after the main application This build flow is more logical and makes sure all the build flags are set in the right order. [skip changelog] --- aerc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/aerc.spec b/aerc.spec index 62dd07b..a398c03 100644 --- a/aerc.spec +++ b/aerc.spec @@ -58,8 +58,6 @@ sed -i "s|github.com/zenhack/go.notmuch|github.com/brunnre8/go.notmuch|" $(find echo 'golang(github.com/brunnre8/go.notmuch)' %build -%set_build_flags -make wrap colorize export BUILDTAGS=notmuch export LDFLAGS="-X main.Version=%{version} \ -X main.Prefix=%{_prefix} \ @@ -68,6 +66,12 @@ export LDFLAGS="-X main.Version=%{version} \ -X git.sr.ht/~rjarry/aerc/config.libexecDir=%{_libexecdir}" %gobuild -o aerc %{goipath} +# The go macros interfere with C build flags. +# Reset LDFLAGS and set other missing build flags. +unset LDFLAGS +%set_build_flags +%make_build wrap colorize doc + %install export PREFIX=%{_prefix} %make_install