Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9eca0b9 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: correct assingment to CFLAGS with CROSS_COMPILE 



Some architectures change $CC in arch/$(ARCH)/Makefile
mips is one example.

That have impact on what options are supported by gcc so move all
$(call cc-option, ...) after include of arch specific Makefile.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 9ee4e336

Makefile

+4 −4
Original line number Original line Diff line number Diff line
@@ -309,9 +309,6 @@ CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) 




CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

                   -fno-strict-aliasing -fno-common

                   -fno-strict-aliasing -fno-common

# Force gcc to behave correct even for buggy distributions

CFLAGS          += $(call cc-option, -fno-stack-protector)



AFLAGS          := -D__ASSEMBLY__

AFLAGS          := -D__ASSEMBLY__





# Read KERNELRELEASE from include/config/kernel.release (if it exists)

# Read KERNELRELEASE from include/config/kernel.release (if it exists)
@@ -486,6 +483,8 @@ else 
CFLAGS		+= -O2

CFLAGS		+= -O2

endif

endif





include $(srctree)/arch/$(ARCH)/Makefile



ifdef CONFIG_FRAME_POINTER

ifdef CONFIG_FRAME_POINTER

CFLAGS		+= -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)

CFLAGS		+= -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)

else

else
@@ -500,7 +499,8 @@ ifdef CONFIG_DEBUG_INFO 
CFLAGS		+= -g

CFLAGS		+= -g

endif

endif





include $(srctree)/arch/$(ARCH)/Makefile

# Force gcc to behave correct even for buggy distributions

CFLAGS          += $(call cc-option, -fno-stack-protector)





# arch Makefile may override CC so keep this after arch Makefile is included

# arch Makefile may override CC so keep this after arch Makefile is included

NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)

NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)