aboutsummaryrefslogtreecommitdiffstats
path: root/macros.in
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2008-01-22 15:00:50 +0000
committerAnssi Hannula <anssi@mandriva.org>2008-01-22 15:00:50 +0000
commit415f1bf3fed5ff1c42818d0108845d1172bb01ea (patch)
tree18e52f6b281142ffd8f73c1f0d2ca36a379e3501 /macros.in
parent4e85fa5fcca3b13ad0103faaffd50213203779d8 (diff)
downloadrpm-setup-415f1bf3fed5ff1c42818d0108845d1172bb01ea.tar
rpm-setup-415f1bf3fed5ff1c42818d0108845d1172bb01ea.tar.gz
rpm-setup-415f1bf3fed5ff1c42818d0108845d1172bb01ea.tar.bz2
rpm-setup-415f1bf3fed5ff1c42818d0108845d1172bb01ea.tar.xz
rpm-setup-415f1bf3fed5ff1c42818d0108845d1172bb01ea.zip
Make %serverbuild define CFLAGS, CXXFLAGS and RPM_OPT_FLAGS variables
as well since some specs are depending on it. Fixes bug #32050.
Diffstat (limited to 'macros.in')
-rw-r--r--macros.in7
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)}