| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 1 | From 98fad8128d0f3b65619827ee5d65f7767b080c4c Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 29 Aug 2019 14:35:16 -0700 |
| 4 | Subject: [PATCH 4/4] Do not override flags coming from build environment |
| 5 | |
| 6 | e.g. we need some optimization level turned on when security flags are enabled |
| 7 | without this change, the build would fail |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | configure.ac | 6 +++--- |
| 12 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 13 | |
| 14 | diff --git a/configure.ac b/configure.ac |
| 15 | index 34e41ea..9bd0fe3 100644 |
| 16 | --- a/configure.ac |
| 17 | +++ b/configure.ac |
| 18 | @@ -16,9 +16,9 @@ AM_INIT_AUTOMAKE(ssi, ${VERSION}) |
| 19 | AM_CONFIG_HEADER(config.h) |
| 20 | |
| 21 | dnl Set the language we use |
| 22 | -CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -fvisibility=hidden -D_GNU_SOURCE -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" |
| 23 | -CFLAGS="-std=gnu99 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" |
| 24 | -CXXFLAGS="-std=gnu++98 -fvisibility-inlines-hidden -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" |
| 25 | +#CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -fvisibility=hidden -D_GNU_SOURCE -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" |
| 26 | +#CFLAGS="-std=gnu99 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" |
| 27 | +#CXXFLAGS="-std=gnu++98 -fvisibility-inlines-hidden -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" |
| 28 | |
| 29 | dnl Automake 1.11 - silent build rules |
| 30 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
| 31 | -- |
| 32 | 2.23.0 |
| 33 | |