diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-04-16 23:32:03 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-04-16 23:32:03 +0200 |
| commit | de71647f7af0cd00b50265498a21b4376955797d (patch) | |
| tree | 25cce7eaa39e8db6a2ce45951095cfc8f6604eaa /Makefile | |
| parent | d2f3390e735fee90e7ebf520b1d80dbd33588ad2 (diff) | |
| parent | a86fe3537350613c0181ce936884036a9695ceea (diff) | |
Merge branch 'kbuild/kbuild' into kbuild/for-next
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -105,10 +105,6 @@ ifeq ("$(origin O)", "command line") KBUILD_OUTPUT := $(O) endif -ifeq ("$(origin W)", "command line") - export KBUILD_ENABLE_EXTRA_GCC_CHECKS := $(W) -endif - # That's our default target when none is given on the command line PHONY := _all _all: @@ -747,6 +743,7 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO endif +include $(srctree)/scripts/Makefile.extrawarn include ${srctree}/scripts/Makefile.lto # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments |