45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Martin Wilck <mwilck@suse.com>
|
||
|
|
Date: Mon, 11 May 2020 15:27:34 +0200
|
||
|
|
Subject: [PATCH] multipath-tools: Makefile.inc: separate out OPTFLAGS
|
||
|
|
|
||
|
|
OPTFLAGS is what distribution builds would typically override. That
|
||
|
|
should not include the warning flags we use.
|
||
|
|
|
||
|
|
Moreover, in the definition of CFLAGS, put $(CFLAGS) first to make it
|
||
|
|
easier for the user to spot her input in the build logs.
|
||
|
|
|
||
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
||
|
|
---
|
||
|
|
Makefile.inc | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
||
|
|
index d4d1e0dd..7a59db85 100644
|
||
|
|
--- a/Makefile.inc
|
||
|
|
+++ b/Makefile.inc
|
||
|
|
@@ -93,14 +93,14 @@ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
|
||
|
|
ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,)
|
||
|
|
WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,)
|
||
|
|
|
||
|
|
-OPTFLAGS = -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \
|
||
|
|
+OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
|
||
|
|
+WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \
|
||
|
|
-Werror=implicit-function-declaration -Werror=format-security \
|
||
|
|
- $(WNOCLOBBERED) \
|
||
|
|
- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
|
||
|
|
- $(STACKPROT) --param=ssp-buffer-size=4
|
||
|
|
+ $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
|
||
|
|
CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2
|
||
|
|
-CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
|
||
|
|
- -MMD -MP $(CFLAGS)
|
||
|
|
+CFLAGS := $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
|
||
|
|
+ -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
|
||
|
|
+ -MMD -MP
|
||
|
|
BIN_CFLAGS = -fPIE -DPIE
|
||
|
|
LIB_CFLAGS = -fPIC
|
||
|
|
SHARED_FLAGS = -shared
|
||
|
|
--
|
||
|
|
2.17.2
|
||
|
|
|