summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2013-05-13 15:03:22 -0400
committerVijay Bellur <vbellur@redhat.com>2013-05-19 06:08:39 -0700
commit2b65c50554ec434a6ec9aecaea5d9885cf2aadf8 (patch)
tree9847615ab712335d8b8bc053a6cdbf7f1b296779
parentb6e78710bfe0905bdaae8ef4fadd2a676f44bdfe (diff)
configure.ac: enable-debug change breaks _hardened_build
See RHBZ 955283, and http://fedoraproject.org/wiki/Packaging:Guidelines#PIE The previous change for BZ 851092 in commit 058a736f9e36238c284ca80e7ed5f62434655019 breaks the ability to enable _hardened_build in release-3.4 and master BUG: 851092 Change-Id: Ib298a492fee22dd82042af704fe8cdd34c3e100e Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/4998 Reviewed-by: Niels de Vos <ndevos@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--configure.ac12
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 435496e8561..02dd5552db9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,7 +536,6 @@ AC_SUBST(GF_DISTRIBUTION)
GF_HOST_OS=""
GF_LDFLAGS="-rdynamic"
-CFLAGS="-g"
# check for gcc -Werror=format-security
saved_CFLAGS=$CFLAGS
@@ -612,13 +611,12 @@ AC_ARG_ENABLE([debug],
AC_HELP_STRING([--enable-debug],
[Enable debug build options.]))
-DEBUG=no
+BUILD_DEBUG=no
if test "x$enable_debug" = "xyes"; then
- DEBUG=yes
- CFLAGS="-O0 $CFLAGS"
+ BUILD_DEBUG=yes
+ CFLAGS=`echo $CFLAGS | sed -e s/O2/O0/`
else
- CFLAGS="-O2 $CFLAGS"
- DEBUG=no
+ BUILD_DEBUG=no
fi
AC_SUBST(CFLAGS)
# end enable debug section
@@ -688,7 +686,7 @@ echo "fusermount : $BUILD_FUSERMOUNT"
echo "readline : $BUILD_READLINE"
echo "georeplication : $BUILD_SYNCDAEMON"
echo "Linux-AIO : $BUILD_LIBAIO"
-echo "Enable Debug : $DEBUG"
+echo "Enable Debug : $BUILD_DEBUG"
echo "systemtap : $BUILD_SYSTEMTAP"
echo "Block Device backend : $BUILD_BD_XLATOR"
echo