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@xxxxxxx> --- MCONFIG.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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@ -- 2.18.0.rc0
