[4/5] MCONFIG: move SANITIZER_CFLAGS out of CLFAGS

Message ID 20180809024219.15696-4-tytso@mit.edu
State Accepted
Headers show
Series
  • [1/5] libext2fs: revamp bitmap types to fix LTO warnings
Related show

Commit Message

Theodore Y. Ts'o Aug. 9, 2018, 2:42 a.m.
CFLAGS is supposed to be something that can be overridden by the
developer.  So extra stuff like $(SANITIZER_CFLAGS) should not be
defined there, but rather in ALL_CFLAGS.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 MCONFIG.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/MCONFIG.in b/MCONFIG.in
index c3b3740e5..ce0692ec5 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -86,13 +86,13 @@  SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_l
 
 CC = @CC@
 BUILD_CC = @BUILD_CC@
-CFLAGS = $(SANITIZER_CFLAGS) @CFLAGS@
-CFLAGS_SHLIB = $(SANITIZER_CFLAGS) @CFLAGS_SHLIB@
-CFLAGS_STLIB = $(SANITIZER_CFLAGS) @CFLAGS_STLIB@
+CFLAGS = @CFLAGS@
+CFLAGS_SHLIB = @CFLAGS_SHLIB@
+CFLAGS_STLIB = @CFLAGS_STLIB@
 CPPFLAGS = @INCLUDES@
-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS)
-ALL_CFLAGS_SHLIB = $(CPPFLAGS) $(CFLAGS_SHLIB) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS)
-ALL_CFLAGS_STLIB = $(CPPFLAGS) $(CFLAGS_STLIB) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS)
+ALL_CFLAGS = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS)
+ALL_CFLAGS_SHLIB = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS_SHLIB) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS)
+ALL_CFLAGS_STLIB = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS_STLIB) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS)
 LDFLAGS = $(SANITIZER_LDFLAGS) @LDFLAGS@
 LDFLAGS_SHLIB = $(SANITIZER_LDFLAGS) @LDFLAGS_SHLIB@
 ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@