Make %serverbuild define CFLAGS, CXXFLAGS and RPM_OPT_FLAGS variables

as well since some specs are depending on it. Fixes bug #32050.

1 files changed, 5 insertions, 2 deletions

diff --git a/macros.in b/macros.in
index a8d91d3..0a78499 100644
--- a/macros.in
+++ b/macros.in
@@ -457,8 +457,11 @@ then %{_scrollkeeper_bin} -q || true ; fi \
 #	(Note: Above is the goal, below are the macros under development)
 #
 
-# Servers opt flags
-%serverbuild %define _serverbuild_flags -fstack-protector-all
+# Servers opt flags.
+# Also set the env variables for backward compatibility (#32050).
+%serverbuild %define _serverbuild_flags -fstack-protector-all \
+export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%optflags" \
+%{nil}
 
 %__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)}