History

Merge tag 'kbuild-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull more Kbuild updates from Masahiro Yamada: - use 'pwd' instead of '/bin/pwd' for portability - clean up Makefiles - fix ld-option for clang - fix malloc'ed data size in Kconfig - fix parallel building along with coccicheck - fix a minor issue of package building - prompt to use "rpm-pkg" instead of "rpm" - clean up *.i and *.lst patterns by "make clean" * tag 'kbuild-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: drop $(extra-y) from real-objs-y kbuild: clean up *.i and *.lst patterns by make clean kbuild: rpm: prompt to use "rpm-pkg" if "rpm" target is used kbuild: pkg: use --transform option to prefix paths in tar coccinelle: fix parallel build with CHECK=scripts/coccicheck kconfig/symbol.c: use correct pointer type argument for sizeof kbuild: Set KBUILD_CFLAGS before incl. arch Makefile kbuild: remove all dummy assignments to obj- kbuild: create built-in.o automatically if parent directory wants it kbuild: /bin/pwd -> pwd

Linus Torvalds committed 8 years ago

Commit 5e2fda42 parents f61ec2c 10aaa3b29 files · +58 −113Browse files

Showing the changes to scripts/Makefile.build (1 of 29 files). Show all

Unified · Split

scripts/Makefile.build+2−2
@@ -76,7 +76,7 @@ lib-target := $(obj)/lib.a · 75 unmodified lines
7676 obj-y += $(obj)/lib-ksyms.o
7777 endif
7878
79−ifneq ($(strip $(obj-y) $(obj-m) $(obj-) $(subdir-m) $(lib-target)),)
79+ifneq ($(strip $(obj-y) $(need-builtin)),)
8080 builtin-target := $(obj)/built-in.o
8181 endif
8282
@@ -566,7 +566,7 @@ targets := $(filter-out $(PHONY), $(targets)) · 483 unmodified lines
566566
567567 PHONY += $(subdir-ym)
568568 $(subdir-ym):
569− $(Q)$(MAKE) $(build)=$@
569+ $(Q)$(MAKE) $(build)=$@ need-builtin=$(if $(findstring $@,$(subdir-obj-y)),1)
570570
571571 # Add FORCE to the prequisites of a target to force it to be always rebuilt.
572572 # ---------------------------------------------------------------------------