Skip to content

Commit 2fbd36d

Browse files
committed
Merge tag 'kbuild-fixes-v5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada: - Adjust gen_compile_commands.py to the format change of *.mod files - Remove unused macro in scripts/Makefile.modinst * tag 'kbuild-fixes-v5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: remove unused cmd_none in scripts/Makefile.modinst gen_compile_commands: handle multiple lines per .mod file
2 parents 2b9b31c + f5a4618 commit 2fbd36d

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

scripts/Makefile.modinst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ modules := $(patsubst $(extmod_prefix)%, $(dst)/%$(suffix-y), $(modules))
2828
__modinst: $(modules)
2929
@:
3030

31-
quiet_cmd_none =
32-
cmd_none = :
33-
3431
#
3532
# Installation
3633
#

scripts/clang-tools/gen_compile_commands.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ def cmdfiles_for_modorder(modorder):
157157
if ext != '.ko':
158158
sys.exit('{}: module path must end with .ko'.format(ko))
159159
mod = base + '.mod'
160-
# The first line of *.mod lists the objects that compose the module.
160+
# Read from *.mod, to get a list of objects that compose the module.
161161
with open(mod) as m:
162-
for obj in m.readline().split():
163-
yield to_cmdfile(obj)
162+
for mod_line in m:
163+
yield to_cmdfile(mod_line.rstrip())
164164

165165

166166
def process_line(root_directory, command_prefix, file_path):

0 commit comments

Comments
 (0)