From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUyZ0-0003Dj-2Y for qemu-devel@nongnu.org; Wed, 03 Aug 2016 11:58:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUyYu-0007qY-Aq for qemu-devel@nongnu.org; Wed, 03 Aug 2016 11:58:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47434) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUyYu-0007qT-4x for qemu-devel@nongnu.org; Wed, 03 Aug 2016 11:58:28 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 903A22640 for ; Wed, 3 Aug 2016 15:58:27 +0000 (UTC) References: <20160803145541.15355-1-marcandre.lureau@redhat.com> <20160803145541.15355-2-marcandre.lureau@redhat.com> From: Paolo Bonzini Message-ID: <6e3fffb7-c951-02f8-701a-72df1b6f4498@redhat.com> Date: Wed, 3 Aug 2016 17:58:23 +0200 MIME-Version: 1.0 In-Reply-To: <20160803145541.15355-2-marcandre.lureau@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-2.7 v3 01/36] build-sys: fix building with make CFLAGS=.. argument List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org On 03/08/2016 16:55, marcandre.lureau@redhat.com wrote: > From: Marc-Andr=C3=A9 Lureau >=20 > When calling make with a CFLAGS=3D.. 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. >=20 > 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) >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > Makefile | 3 ++- > pc-bios/optionrom/Makefile | 2 -- > 2 files changed, 2 insertions(+), 3 deletions(-) >=20 > 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)) > =20 > ROMSUBDIR_RULES=3D$(patsubst %,romsubdir-%, $(ROMS)) > +# Only keep -O and -g cflags > romsubdir-%: > - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V=3D"$= (V)" TARGET_DIR=3D"$*/",) > + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V=3D"$= (V)" TARGET_DIR=3D"$*/" CFLAGS=3D"$(filter -O% -g%,$(CFLAGS))",) > =20 > ALL_SUBDIRS=3D$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) > =20 > 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 +=3D $(call cc-option, $(QEMU_CFLAGS), -n= o-integrated-as) > QEMU_CFLAGS +=3D -m32 -include $(SRC_PATH)/pc-bios/optionrom/code16gcc= .h > endif > =20 > -# Drop gcov and glib flags > -CFLAGS :=3D $(filter -O% -g%, $(CFLAGS)) > QEMU_INCLUDES +=3D -I$(SRC_PATH) > =20 > Wa =3D -Wa, >=20 Reviewed-by: Paolo Bonzini