diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-19 20:26:12 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-26 02:01:28 +0900 |
| commit | 5e18f0290f2eccb0f64e87fbfca6395f11985b4b (patch) | |
| tree | 08dbdb849b1b0e8de73bc5e29e866ddbce4519f7 /scripts | |
| parent | 7657f60e8ffad587fabc74873b5f42083a60c3cf (diff) | |
| download | linux-5e18f0290f2eccb0f64e87fbfca6395f11985b4b.tar.gz linux-5e18f0290f2eccb0f64e87fbfca6395f11985b4b.tar.bz2 linux-5e18f0290f2eccb0f64e87fbfca6395f11985b4b.zip | |
kbuild: clean up archive rule of built-in.a
With the incremental linking entirely dropped, we can simplify
the Makefile.
While I am here, I renamed cmd_link_o_target to cmd_ar_builtin.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 66461e9323b4..e5c1aa347554 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -450,17 +450,12 @@ ifdef builtin-target # makes them small and fast, but unable to be used by the linker. # scripts/link-vmlinux.sh builds an aggregate built-in.a with a symbol # table and index. -cmd_make_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) -cmd_make_empty_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) -quiet_cmd_link_o_target = AR $@ - -# If the list of objects to link is empty, just create an empty built-in.a -cmd_link_o_target = $(if $(strip $(real-obj-y)),\ - $(cmd_make_builtin) $@ $(filter $(real-obj-y), $^), \ - $(cmd_make_empty_builtin) $@) +quiet_cmd_ar_builtin = AR $@ + cmd_ar_builtin = rm -f $@; \ + $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(filter $(real-obj-y), $^) $(builtin-target): $(real-obj-y) FORCE - $(call if_changed,link_o_target) + $(call if_changed,ar_builtin) targets += $(builtin-target) endif # builtin-target |