From 9bee39d5839249ce2ea7825e6695dc80364a4eb5 Mon Sep 17 00:00:00 2001
From: "Steffen (Daode) Nurpmeso" <sdaoden@users.sf.net>
Date: Thu, 29 May 2014 14:51:07 +0200
Subject: [PATCH] mk-conf.sh, compiler_flags(): -ftrapv only for extended CCs

---
 mk-conf.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk-conf.sh b/mk-conf.sh
index ffb7645a..b7eab3d9 100644
--- a/mk-conf.sh
+++ b/mk-conf.sh
@@ -129,9 +129,9 @@ compiler_flags() {
    if nwantfeat DEBUG; then
       _CFLAGS="${optim} -DNDEBUG ${_CFLAGS}"
    else
-      _CFLAGS="${dbgoptim} -g -ftrapv ${_CFLAGS}";
+      _CFLAGS="${dbgoptim} -g ${_CFLAGS}";
       if [ "${stackprot}" = yes ]; then
-         _CFLAGS="${_CFLAGS} -fstack-protector-all "
+         _CFLAGS="${_CFLAGS} -ftrapv -fstack-protector-all "
             _CFLAGS="${_CFLAGS} -Wstack-protector -D_FORTIFY_SOURCE=2"
       fi
    fi
-- 
2.11.4.GIT