From fc3baad7bf1a2256ae784181a6ec73c5242db8b5 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 11 Sep 2009 18:45:40 +0200 Subject: restore CFLAGS check for conflict and fix recursive CFLAGS issue 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 Signed-off-by: Anthony Liguori --- pc-bios/optionrom/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pc-bios') 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 -- cgit v1.1