49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
||
|
Date: Wed, 19 Apr 2017 06:10:01 -0500
|
||
|
Subject: [PATCH] RH: use rpm optflags if present
|
||
|
|
||
|
Use the passed in optflags when compiling as an RPM, and keep the
|
||
|
default flags as close as possible to the current fedora flags, while
|
||
|
still being generic.
|
||
|
|
||
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
||
|
---
|
||
|
Makefile.inc | 20 +++++++++++++-------
|
||
|
1 file changed, 13 insertions(+), 7 deletions(-)
|
||
|
|
||
|
diff --git a/Makefile.inc b/Makefile.inc
|
||
|
index 2591fa9..ffcc8b6 100644
|
||
|
--- a/Makefile.inc
|
||
|
+++ b/Makefile.inc
|
||
|
@@ -80,13 +80,19 @@ TEST_CC_OPTION = $(shell \
|
||
|
echo "$(2)"; \
|
||
|
fi)
|
||
|
|
||
|
-STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
|
||
|
-
|
||
|
-OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \
|
||
|
- -Werror=implicit-function-declaration -Werror=format-security \
|
||
|
- -Wno-sign-compare -Wno-unused-parameter -Wno-clobbered \
|
||
|
- -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
|
||
|
- --param=ssp-buffer-size=4
|
||
|
+ifndef RPM_OPT_FLAGS
|
||
|
+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
|
||
|
+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \
|
||
|
+ -Wp,-D_FORTIFY_SOURCE=2 -fexceptions \
|
||
|
+ $(STACKPROT) --param=ssp-buffer-size=4 \
|
||
|
+ -grecord-gcc-switches
|
||
|
+ ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1)
|
||
|
+ OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
|
||
|
+ endif
|
||
|
+endif
|
||
|
+OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=2 -Werror=implicit-int \
|
||
|
+ -Werror=implicit-function-declaration -Wno-sign-compare \
|
||
|
+ -Wno-unused-parameter
|
||
|
|
||
|
CFLAGS = $(OPTFLAGS) -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
|
||
|
BIN_CFLAGS = -fPIE -DPIE
|
||
|
--
|
||
|
2.7.4
|
||
|
|