From patchwork Thu Aug 9 02:42:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 955302 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mit.edu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=thunk.org header.i=@thunk.org header.b="pqUe0mFr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41mCG80hhWz9s4Z for ; Thu, 9 Aug 2018 12:42:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727393AbeHIFEx (ORCPT ); Thu, 9 Aug 2018 01:04:53 -0400 Received: from imap.thunk.org ([74.207.234.97]:52966 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727237AbeHIFEx (ORCPT ); Thu, 9 Aug 2018 01:04:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=kqYhvLnYWKFqzL03fn8I4d67bx/nXBnnqAfIiUhZvIA=; b=pqUe0mFriSLHtLeE+fRmFXbO8X ZTB0/sOyYE0eXMa8VWVVNS+KvKsJ3saAWGDTqeAH9bbsGt8fH6mPhp+KNKxTgDQR3EZLOw0QntaCb bB6S+iyVIJDUWphf2KBE6AmfDH3Unb42UvRrezbVILvFWNGUXZpUdZKHrrzMG7lCOPGE=; Received: from root (helo=callcc.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.89) (envelope-from ) id 1fnau6-0000a8-SY; Thu, 09 Aug 2018 02:42:22 +0000 Received: by callcc.thunk.org (Postfix, from userid 15806) id C13BA7A6516; Wed, 8 Aug 2018 22:42:21 -0400 (EDT) From: Theodore Ts'o To: Ext4 Developers List Cc: Theodore Ts'o Subject: [PATCH 4/5] MCONFIG: move SANITIZER_CFLAGS out of CLFAGS Date: Wed, 8 Aug 2018 22:42:18 -0400 Message-Id: <20180809024219.15696-4-tytso@mit.edu> X-Mailer: git-send-email 2.18.0.rc0 In-Reply-To: <20180809024219.15696-1-tytso@mit.edu> References: <20180809024219.15696-1-tytso@mit.edu> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 --- 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@