diff options
| author |   Thomas Monjalon <thomas_ml@monjalon.net> | 2009-09-11 18:45:40 +0200 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-10-05 09:32:53 -0500 |
| commit | fc3baad7bf1a2256ae784181a6ec73c5242db8b5 (patch) | |
| tree | 13fac367a17007ef529c9636ce11980cd6bb151c /pc-bios | |
| parent | virtio-pci: return error if virtio_console_init fails (diff) | |
| download | qemu-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>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/optionrom/Makefile | 4 |
1 files changed, 2 insertions, 2 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 |