restore CFLAGS check for conflict and fix recursive CFLAGS issue

[mirror_qemu.git] / pc-bios / optionrom / Makefile

diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 78ce684cf2d3ae956e44fc593cde80b0f4eb8162..d9b6639e170f3c90d51b724743ee907708033965 100644 (file)
--- 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