diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-19 10:01:26 +0100 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-25 19:01:25 +0200 |
| commit | fe852ac200311bcbbb0a8c84096e4cd44ea623d9 (patch) | |
| tree | 185dcea25b35ff7856f108d042e5b028389c61f0 /scripts/Makefile.build | |
| parent | kbuild: fix modname for composite modules (diff) | |
| download | linux-fe852ac200311bcbbb0a8c84096e4cd44ea623d9.tar.xz linux-fe852ac200311bcbbb0a8c84096e4cd44ea623d9.zip | |
kbuild: simplify modname calculation
modname can be calculated much more simply. If modname-multi is
empty, it is a single-used object. So, modname = $(basetarget).
Otherwise, modname = $(modname-multi).
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Diffstat (limited to 'scripts/Makefile.build')
| -rw-r--r-- | scripts/Makefile.build | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 7cd2f4a6c2ac..f5858f609210 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -131,17 +131,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] $(obj-m) : quiet_modtag := [M] -# Default for not multi-part modules -modname = $(basetarget) - -$(multi-objs-m) : modname = $(modname-multi) -$(multi-objs-m:.o=.i) : modname = $(modname-multi) -$(multi-objs-m:.o=.s) : modname = $(modname-multi) -$(multi-objs-m:.o=.lst) : modname = $(modname-multi) -$(multi-objs-y) : modname = $(modname-multi) -$(multi-objs-y:.o=.i) : modname = $(modname-multi) -$(multi-objs-y:.o=.s) : modname = $(modname-multi) -$(multi-objs-y:.o=.lst) : modname = $(modname-multi) +modname = $(if $(modname-multi),$(modname-multi),$(basetarget)) quiet_cmd_cc_s_c = CC $(quiet_modtag) $@ cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $< |