diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 20:45:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 20:45:29 -0500 |
commit | 09bd7c75e55cbaa6c731b0c3a5512ad89159f26f (patch) | |
tree | a73bd9f94d7661d6ff82f3374d4efea81925f7c8 /scripts/Makefile.headersinst | |
parent | fa7f578076a8814caa5371e9f4949e408140766d (diff) | |
parent | 7f855fc805cd9c29867aed56cc20f818b36a7b7b (diff) |
Merge tag 'kbuild-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada:
"One of the most remarkable improvements in this cycle is, Kbuild is
now able to cache the result of shell commands. Some variables are
expensive to compute, for example, $(call cc-option,...) invokes the
compiler. It is not efficient to redo this computation every time,
even when we are not actually building anything. Kbuild creates a
hidden file ".cache.mk" that contains invoked shell commands and their
results. The speed-up should be noticeable.
Summary:
- Fix arch build issues (hexagon, sh)
- Clean up various Makefiles and scripts
- Fix wrong usage of {CFLAGS,LDFLAGS}_MODULE in arch Makefiles
- Cache variables that are expensive to compute
- Improve cc-ldopton and ld-option for Clang
- Optimize output directory creation"
* tag 'kbuild-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (30 commits)
kbuild: move coccicheck help from scripts/Makefile.help to top Makefile
sh: decompressor: add shipped files to .gitignore
frv: .gitignore: ignore vmlinux.lds
selinux: remove unnecessary assignment to subdir-
kbuild: specify FORCE in Makefile.headersinst as .PHONY target
kbuild: remove redundant mkdir from ./Kbuild
kbuild: optimize object directory creation for incremental build
kbuild: create object directories simpler and faster
kbuild: filter-out PHONY targets from "targets"
kbuild: remove redundant $(wildcard ...) for cmd_files calculation
kbuild: create directory for make cache only when necessary
sh: select KBUILD_DEFCONFIG depending on ARCH
kbuild: fix linker feature test macros when cross compiling with Clang
kbuild: shrink .cache.mk when it exceeds 1000 lines
kbuild: do not call cc-option before KBUILD_CFLAGS initialization
kbuild: Cache a few more calls to the compiler
kbuild: Add a cache for generated variables
kbuild: add forward declaration of default target to Makefile.asm-generic
kbuild: remove KBUILD_SUBDIR_ASFLAGS and KBUILD_SUBDIR_CCFLAGS
hexagon/kbuild: replace CFLAGS_MODULE with KBUILD_CFLAGS_MODULE
...
Diffstat (limited to 'scripts/Makefile.headersinst')
-rw-r--r-- | scripts/Makefile.headersinst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 99967948d764..d5e131471131 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst | |||
@@ -27,11 +27,11 @@ subdirs := $(patsubst $(srcdir)/%/,%,\ | |||
27 | # Recursion | 27 | # Recursion |
28 | __headers: $(subdirs) | 28 | __headers: $(subdirs) |
29 | 29 | ||
30 | .PHONY: $(subdirs) | 30 | PHONY += $(subdirs) |
31 | $(subdirs): | 31 | $(subdirs): |
32 | $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(dst)/$@ | 32 | $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(dst)/$@ |
33 | 33 | ||
34 | # Skip header install/check for include/uapi and arch/$(hdr-arch)/include/uapi. | 34 | # Skip header install/check for include/uapi and arch/$(SRCARCH)/include/uapi. |
35 | # We have only sub-directories there. | 35 | # We have only sub-directories there. |
36 | skip-inst := $(if $(filter %/uapi,$(obj)),1) | 36 | skip-inst := $(if $(filter %/uapi,$(obj)),1) |
37 | 37 | ||
@@ -115,9 +115,8 @@ $(check-file): scripts/headers_check.pl $(output-files) FORCE | |||
115 | 115 | ||
116 | endif | 116 | endif |
117 | 117 | ||
118 | targets := $(wildcard $(sort $(targets))) | ||
119 | cmd_files := $(wildcard \ | 118 | cmd_files := $(wildcard \ |
120 | $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd)) | 119 | $(foreach f,$(sort $(targets)),$(dir $(f)).$(notdir $(f)).cmd)) |
121 | 120 | ||
122 | ifneq ($(cmd_files),) | 121 | ifneq ($(cmd_files),) |
123 | include $(cmd_files) | 122 | include $(cmd_files) |
@@ -125,6 +124,7 @@ endif | |||
125 | 124 | ||
126 | endif # skip-inst | 125 | endif # skip-inst |
127 | 126 | ||
128 | .PHONY: $(PHONY) | ||
129 | PHONY += FORCE | 127 | PHONY += FORCE |
130 | FORCE: ; | 128 | FORCE: ; |
129 | |||
130 | .PHONY: $(PHONY) | ||