From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 7 Oct 2014 10:40:41 +0000 (+0200)
Subject: Don't override the user's FLAGS
X-Git-Tag: rec-3.7.0-rc1~211^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1789%2Fhead;p=thirdparty%2Fpdns.git

Don't override the user's FLAGS

Fedora for instance sets -fstack-protector-strong
but we override that with -fstack-protector, which is less secure

Ideally we never touch CFLAGS, CXXFLAGS and the like but fixing
that is an exercise left for the reader.
---

diff --git a/configure.ac b/configure.ac
index 9028cfe7b7..2918d0afb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,9 +339,9 @@ for a in $dynmodules; do
   moduledirs="$moduledirs ${a}backend"
 done
 
-CFLAGS="$CFLAGS $PIE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $PIE_CFLAGS"
-LDFLAGS="$LDFLAGS $RELRO_LDFLAGS"
+CFLAGS="$PIE_CFLAGS $CFLAGS"
+CXXFLAGS="$PIE_CFLAGS $CXXFLAGS"
+LDFLAGS="$RELRO_LDFLAGS $LDFLAGS"
 
 AC_SUBST(LIBS)
 
diff --git a/m4/pdns_d_fortify_source.m4 b/m4/pdns_d_fortify_source.m4
index 7f90329a99..605990c47a 100644
--- a/m4/pdns_d_fortify_source.m4
+++ b/m4/pdns_d_fortify_source.m4
@@ -22,7 +22,7 @@ AC_DEFUN([AC_CC_D_FORTIFY_SOURCE],[
       OLD_CXXFLAGS="$CXXFLAGS"
       CXXFLAGS="-Wall -W -Werror $CXXFLAGS"
       gl_COMPILER_OPTION_IF([-D_FORTIFY_SOURCE=2], [
-        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-        CXXFLAGS="$OLD_CXXFLAGS -D_FORTIFY_SOURCE=2"
+        CFLAGS="-D_FORTIFY_SOURCE=2 $CFLAGS"
+        CXXFLAGS="-D_FORTIFY_SOURCE=2 $OLD_CXXFLAGS"
       ], [CXXFLAGS="$OLD_CXXFLAGS"], [AC_LANG_PROGRAM([[#include <stdio.h>]],[])])
 ]) 
diff --git a/m4/pdns_param_ssp_buffer_size.m4 b/m4/pdns_param_ssp_buffer_size.m4
index 1c7ce83e8e..05c1baef04 100644
--- a/m4/pdns_param_ssp_buffer_size.m4
+++ b/m4/pdns_param_ssp_buffer_size.m4
@@ -20,7 +20,7 @@ dnl
 
 AC_DEFUN([AC_CC_PARAM_SSP_BUFFER_SIZE],[
       gl_COMPILER_OPTION_IF([--param ssp-buffer-size=$1], [
-        CFLAGS="$CFLAGS --param ssp-buffer-size=$1"
-        CXXFLAGS="$CXXFLAGS --param ssp-buffer-size=$1"
+        CFLAGS="--param ssp-buffer-size=$1 $CFLAGS"
+        CXXFLAGS="--param ssp-buffer-size=$1 $CXXFLAGS"
       ])
 ]) 
diff --git a/m4/pdns_stack_protector.m4 b/m4/pdns_stack_protector.m4
index c268d48c58..388035cf1c 100644
--- a/m4/pdns_stack_protector.m4
+++ b/m4/pdns_stack_protector.m4
@@ -20,7 +20,7 @@ dnl
 
 AC_DEFUN([AC_CC_STACK_PROTECTOR],[
       gl_COMPILER_OPTION_IF([-fstack-protector], [
-        CFLAGS="$CFLAGS -fstack-protector"
-        CXXFLAGS="$CXXFLAGS -fstack-protector"
+        CFLAGS="-fstack-protector $CFLAGS"
+        CXXFLAGS="-fstack-protector $CXXFLAGS"
       ])
 ])