aboutsummaryrefslogtreecommitdiffstats
path: root/macros.in
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-12-20 09:48:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-12-20 09:48:47 +0000
commit7e9fe8870b9e3765e783fe73141ac40c6a3e97f5 (patch)
treeea490cd15c8d1487940abf5cc0927479eb6ec609 /macros.in
parent93ba0c64e011dca6fe6df90508bc10efc75159ec (diff)
downloadrpm-setup-7e9fe8870b9e3765e783fe73141ac40c6a3e97f5.tar
rpm-setup-7e9fe8870b9e3765e783fe73141ac40c6a3e97f5.tar.gz
rpm-setup-7e9fe8870b9e3765e783fe73141ac40c6a3e97f5.tar.bz2
rpm-setup-7e9fe8870b9e3765e783fe73141ac40c6a3e97f5.tar.xz
rpm-setup-7e9fe8870b9e3765e783fe73141ac40c6a3e97f5.zip
make %serverbuild modify %optflags instead of shell variables (Anssi) (#32050)
Diffstat (limited to 'macros.in')
-rw-r--r--macros.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/macros.in b/macros.in
index a8af40a..b537db5 100644
--- a/macros.in
+++ b/macros.in
@@ -84,7 +84,8 @@ Group: %{group}\
# common compilation flags
%_fortify_cflags -Wp,-D_FORTIFY_SOURCE=2
-%_ssp_cflags -fstack-protector --param=ssp-buffer-size=4
+%_serverbuild_flags %nil
+%_ssp_cflags -fstack-protector --param=ssp-buffer-size=4 %{?_serverbuild_flags}
%__common_cflags -O2 %{debugcflags} -pipe %{?_fortify_cflags} %{?_ssp_cflags} -fexceptions
#==============================================================================
@@ -456,8 +457,7 @@ then %{_scrollkeeper_bin} -q || true ; fi \
#
# Servers opt flags
-%serverbuild export CFLAGS="%optflags -fstack-protector-all"; export CXXFLAGS="%optflags -fstack-protector-all"; export RPM_OPT_FLAGS="%optflags -fstack-protector-all" \
-%{nil}
+%serverbuild %define _serverbuild_flags -fstack-protector-all
%__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)}