[Qemu-commits] [COMMIT 8a2e6ab] Remove CFLAGS parameter in cc-option

[Anthony Liguori]

From: Juan Quintela <address@hidden>

With cc-option we are testing if gcc just accept a particular option, we don't 
need CFLAGS at all.  And this fixes the recursive problem with CFLAGS

Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 1d84c07..78887c4 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -9,7 +9,7 @@ VPATH=$(SRC_PATH)/pc-bios/optionrom
 
 CFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
 CFLAGS += -I$(SRC_PATH)
-CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector,"")
+CFLAGS += $(call cc-option, -fno-stack-protector,"")
 
 build-all: multiboot.bin
 
diff --git a/rules.mak b/rules.mak
index c0315ac..3fdbfd3 100644
--- a/rules.mak
+++ b/rules.mak
@@ -19,7 +19,7 @@ LINK = $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(1) 
$(ARLIBS_BEGIN) $(ARLIBS
 quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1))
 
 # cc-option
-# Usage: CFLAGS+=$(call cc-option, $(CFLAGS), -falign-functions=0, 
-malign-functions=0)
+# Usage: CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)
 
-cc-option = $(shell if $(CC) $(1) $(2) -S -o /dev/null -xc /dev/null \
-              > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi ;)
+cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \
+              > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)