kbuild: enable 'make CFLAGS=...' to add additional options to CC

[mirror_ubuntu-artful-kernel.git] / arch / mips / Makefile

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ebd5d02a7d786e73d738ba3b071949ac3f1efe47..64512abef61df4e410adc24e0a63e377153ab444 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -609,13 +609,13 @@ ifdef CONFIG_64BIT
 endif
 
 AFLAGS         += $(cflags-y)
-CFLAGS         += $(cflags-y) \
+KBUILD_CFLAGS  += $(cflags-y) \
                        -D"VMLINUX_LOAD_ADDRESS=$(load-y)"
 
 LDFLAGS                        += -m $(ld-emul)
 
 ifdef CONFIG_MIPS
-CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \
+CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -xc /dev/null | \
        egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \
        sed -e 's/^\#define /-D/' -e "s/ /='/" -e "s/$$/'/")
 ifdef CONFIG_64BIT
@@ -632,7 +632,7 @@ OBJCOPYFLAGS                += --remove-section=.reginfo
 #
 
 CPPFLAGS_vmlinux.lds := \
-       $(CFLAGS) \
+       $(KBUILD_CFLAGS) \
        -D"LOADADDR=$(load-y)" \
        -D"JIFFIES=$(JIFFIES)" \
        -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)"