From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXU0c-0003MF-QH for qemu-devel@nongnu.org; Wed, 10 Aug 2016 09:57:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXU0a-00085O-2H for qemu-devel@nongnu.org; Wed, 10 Aug 2016 09:57:26 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXU0Z-00085F-RZ for qemu-devel@nongnu.org; Wed, 10 Aug 2016 09:57:24 -0400 Received: by mail-wm0-x243.google.com with SMTP id i138so9676609wmf.3 for ; Wed, 10 Aug 2016 06:57:23 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Aug 2016 15:57:05 +0200 Message-Id: <1470837437-14713-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1470837437-14713-1-git-send-email-pbonzini@redhat.com> References: <1470837437-14713-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 02/14] build-sys: fix building with make CFLAGS=.. argument List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-André Lureau When calling make with a CFLAGS=.. argument, the -g/-O filter is not applied, which may result with build failure with ASAN for example. It could be solved with an 'override' directive on CFLAGS, but that would actually prevent setting different CFLAGS manually. Instead, filter the CFLAGS argument from the top-level Makefile (so you could still call make with a different CFLAGS argument on a rom/Makefile manually) Signed-off-by: Marc-André Lureau Reviewed-by: Paolo Bonzini Message-Id: <20160805082421.21994-2-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 3 ++- pc-bios/optionrom/Makefile | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0d7647f..50b4b3a 100644 --- a/Makefile +++ b/Makefile @@ -225,8 +225,9 @@ dtc/%: $(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) +# Only keep -O and -g cflags romsubdir-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/",) + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",) ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 24e175e..6bab490 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -24,8 +24,6 @@ QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -no-integrated-as) QEMU_CFLAGS += -m32 -include $(SRC_PATH)/pc-bios/optionrom/code16gcc.h endif -# Drop gcov and glib flags -CFLAGS := $(filter -O% -g%, $(CFLAGS)) QEMU_INCLUDES += -I$(SRC_PATH) Wa = -Wa, -- 1.8.3.1