From 8ef96d239decb8072bea2bfa35af15500ee960dc Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 9 Apr 2014 11:05:45 +0200 Subject: [PATCH] =?UTF-8?q?gcc:=20improved=20=C3=BCarse-config=20to=20remo?= =?UTF-8?q?ve=20-fstack-protector=20options=20if=20SSP=20is=20not=20wanted?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/gcc/parse-config | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/gcc/parse-config b/base/gcc/parse-config index a044d7965..261de80ad 100644 --- a/base/gcc/parse-config +++ b/base/gcc/parse-config @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../gcc/parse-config -# Copyright (C) 2008 - 2013 The OpenSDE Project +# Copyright (C) 2008 - 2014 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -26,6 +26,12 @@ if [ "${SDECFG_DEFAULT_CC:0:3}" = "gcc" -a "$SDECFG_PKG_GCC_STACKPRO" = 1 ]; the else echo_warning 'Package incompatible with GCC stack-protector, disabled' fi +else + if [ ! "$SDECFG_PKG_GCC_STACKPRO" = 1 ]; then + # some packages have -fstack-protector set by default + # remove -fstack-protector options if SSP is not wanted + var_append GCC_WRAPPER_REMOVE ' ' '-fstack-protector*' + fi fi # maybe we add something more later. But imo it's better to