Commit 8a2e6ab5 authored by Juan Quintela's avatar Juan Quintela Committed by Anthony Liguori
Browse files

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: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 0859df68

pc-bios/optionrom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

rules.mak

+3 −3
Original line number Diff line number Diff line
@@ -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 ;)