From 8a2e6ab50154e89c196d4a5439ce1a725d28b9b6 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 31 Aug 2009 00:48:45 +0200 Subject: [PATCH] Remove CFLAGS parameter in cc-option 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 Signed-off-by: Anthony Liguori --- pc-bios/optionrom/Makefile | 2 +- rules.mak | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 1d84c07f36..78887c41a8 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 c0315acaf8..3fdbfd3d42 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 ;) -- 2.11.4.GIT