diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 21:27:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 21:27:27 -0400 |
commit | ae3e4628287de0ab90545c14076657aeee38506b (patch) | |
tree | a846e66dc3fd31e093f2f0a3965534e2d299013f /Makefile | |
parent | 5f76945a9c978b8b8bf8eb7fe3b17b9981240a97 (diff) | |
parent | 415c2c525fab214ab75413aadbc67b4ee9cf212e (diff) |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
"The main part of kbuild for v3.7 contains:
- Fix for scripts/Makefile.modpost to not choke on a '.ko' substring
in the build directory path
- Two warning fixes (modpost and main Makefile)
- __compiletime_error works also with gcc 4.3
- make tar{gz,bz2,xz}-pkg uses default compression settings instead
of saving as many bytes as possible (this should actually be in the
misc branch, I don't know why I applied it here)."
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
compiler-gcc4.h: correct verion check for __compiletime_error
modpost: Permit .GCC.command.line sections
Kbuild: use normal compression settings for tar*-pkg
scripts/Makefile.modpost: error in finding modules from .mod files.
kbuild: Remove useless warning while appending KCFLAGS
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 19 |
1 files changed, 3 insertions, 16 deletions
@@ -664,22 +664,9 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) | |||
664 | endif | 664 | endif |
665 | 665 | ||
666 | # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments | 666 | # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments |
667 | # But warn user when we do so | 667 | KBUILD_CPPFLAGS += $(KCPPFLAGS) |
668 | warn-assign = \ | 668 | KBUILD_AFLAGS += $(KAFLAGS) |
669 | $(warning "WARNING: Appending $$K$(1) ($(K$(1))) from $(origin K$(1)) to kernel $$$(1)") | 669 | KBUILD_CFLAGS += $(KCFLAGS) |
670 | |||
671 | ifneq ($(KCPPFLAGS),) | ||
672 | $(call warn-assign,CPPFLAGS) | ||
673 | KBUILD_CPPFLAGS += $(KCPPFLAGS) | ||
674 | endif | ||
675 | ifneq ($(KAFLAGS),) | ||
676 | $(call warn-assign,AFLAGS) | ||
677 | KBUILD_AFLAGS += $(KAFLAGS) | ||
678 | endif | ||
679 | ifneq ($(KCFLAGS),) | ||
680 | $(call warn-assign,CFLAGS) | ||
681 | KBUILD_CFLAGS += $(KCFLAGS) | ||
682 | endif | ||
683 | 670 | ||
684 | # Use --build-id when available. | 671 | # Use --build-id when available. |
685 | LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\ | 672 | LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\ |