Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm958-0005R9-GS for qemu-devel@nongnu.org; Fri, 11 Sep 2009 12:34:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm952-0005Fl-77 for qemu-devel@nongnu.org; Fri, 11 Sep 2009 12:34:41 -0400 Received: from [199.232.76.173] (port=48193 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm951-0005Ez-Ue for qemu-devel@nongnu.org; Fri, 11 Sep 2009 12:34:35 -0400 Received: from mail.corp.accelance.fr ([213.162.48.15]:55828) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mm951-0003as-NE for qemu-devel@nongnu.org; Fri, 11 Sep 2009 12:34:35 -0400 Received: from tmonjalo-laptop (LPuteaux-156-15-47-90.w82-127.abo.wanadoo.fr [82.127.74.90]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.corp.accelance.fr (Postfix) with ESMTP id D1AE31AE1D for ; Fri, 11 Sep 2009 18:31:43 +0200 (CEST) Content-Disposition: inline From: Thomas Monjalon Date: Fri, 11 Sep 2009 18:34:32 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200909111834.32237.thomas_ml@monjalon.net> Subject: [Qemu-devel] [PATCH] restore CFLAGS check for conflict and fix recursive CFLAGS issue Reply-To: thomas@monjalon.net List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org cc-option uses more make-syntax to replace the shell "if/else". Issue with recursive += is fixed by doing the first assignment simply-expanded, as explained in http://www.gnu.org/software/make/manual/html_node/Appending.html Signed-off-by: Thomas Monjalon --- pc-bios/optionrom/Makefile | 4 ++-- rules.mak | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 78ce684..d9b6639 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -7,9 +7,9 @@ include $(SRC_PATH)/rules.mak VPATH=$(SRC_PATH)/pc-bios/optionrom -CFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin +CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin CFLAGS += -I$(SRC_PATH) -CFLAGS += $(call cc-option, -fno-stack-protector,"") +CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) QEMU_CFLAGS = $(CFLAGS) build-all: multiboot.bin diff --git a/rules.mak b/rules.mak index 3fdbfd3..54ac88a 100644 --- a/rules.mak +++ b/rules.mak @@ -21,5 +21,5 @@ quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) # cc-option # Usage: CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0) -cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) +cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ + >/dev/null 2>&1 && echo OK), $2, $3) -- Thomas