summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Monjalon <thomas_ml@monjalon.net>2009-09-11 18:45:40 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-05 09:32:53 -0500
commitfc3baad7bf1a2256ae784181a6ec73c5242db8b5 (patch)
tree13fac367a17007ef529c9636ce11980cd6bb151c
parentvirtio-pci: return error if virtio_console_init fails (diff)
downloadqemu-kvm-fc3baad7bf1a2256ae784181a6ec73c5242db8b5.tar.gz
qemu-kvm-fc3baad7bf1a2256ae784181a6ec73c5242db8b5.tar.bz2
qemu-kvm-fc3baad7bf1a2256ae784181a6ec73c5242db8b5.zip
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 <thomas@monjalon.net> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--pc-bios/optionrom/Makefile4
-rw-r--r--rules.mak4
2 files changed, 4 insertions, 4 deletions
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 78ce684cf..d9b6639e1 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 3fdbfd3d4..54ac88ab3 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)