Skip to content

Commit

Permalink
kbuild: remove ifdef builtin-target / lib-target
Browse files Browse the repository at this point in the history
I do not see a good reason to add ifdef here.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
  • Loading branch information
Masahiro Yamada committed May 25, 2020
1 parent 9504bbe commit e578edc
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions scripts/Makefile.build
Original file line number Diff line number Diff line change
Expand Up @@ -384,16 +384,14 @@ $(obj)/%/built-in.a: $(obj)/% ;
#
# Rule to compile a set of .o files into one .a file (without symbol table)
#
ifdef builtin-target

quiet_cmd_ar_builtin = AR $@
cmd_ar_builtin = rm -f $@; $(AR) cDPrST $@ $(real-prereqs)

$(builtin-target): $(real-obj-y) FORCE
$(obj)/built-in.a: $(real-obj-y) FORCE
$(call if_changed,ar_builtin)

targets += $(builtin-target)
endif # builtin-target

#
# Rule to create modules.order file
Expand All @@ -408,15 +406,11 @@ $(modorder-target): $(subdir-ym) FORCE
#
# Rule to compile a set of .o files into one .a file (with symbol table)
#
ifdef lib-target

$(lib-target): $(lib-y) FORCE
$(obj)/lib.a: $(lib-y) FORCE
$(call if_changed,ar)

targets += $(lib-target)

endif

# NOTE:
# Do not replace $(filter %.o,^) with $(real-prereqs). When a single object
# module is turned into a multi object module, $^ will contain header file
Expand Down

0 comments on commit e578edc

Please sign in to comment.