diff options
author | Ashutosh Naik <ashutosh@chelsio.com> | 2008-10-25 18:02:53 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2008-10-29 17:02:10 -0400 |
commit | e6e6733ed9451827165d853f25bf99ba55e12feb (patch) | |
tree | abd3d62172a8b2952d291a7e59b7b60485fa28ae /scripts | |
parent | 92f83cc56eeafdb8fcf07ceb89fd9a0212bd498c (diff) |
kbuild: prevent modpost from looking for a .cmd file for a static library linked into a module
This fixes a compile time warning which occurs whenever a static library
is linked into a kernel module. MODPOST tries to look for a
".<modulename>.cmd" file to look for its dependencies, but that file
doesn't exist or get generated for static libraries.
This patch prevents modpost from looking for a .cmd file when a module is
linked with a static library
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Ashutosh Naik <ashutosh.naik@gmail.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mod/sumversion.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index d9cc6901d680..aadc5223dcdb 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c | |||
@@ -290,6 +290,15 @@ static int parse_file(const char *fname, struct md4_ctx *md) | |||
290 | release_file(file, len); | 290 | release_file(file, len); |
291 | return 1; | 291 | return 1; |
292 | } | 292 | } |
293 | /* Check whether the file is a static library or not */ | ||
294 | static int is_static_library(const char *objfile) | ||
295 | { | ||
296 | int len = strlen(objfile); | ||
297 | if (objfile[len - 2] == '.' && objfile[len - 1] == 'a') | ||
298 | return 1; | ||
299 | else | ||
300 | return 0; | ||
301 | } | ||
293 | 302 | ||
294 | /* We have dir/file.o. Open dir/.file.o.cmd, look for deps_ line to | 303 | /* We have dir/file.o. Open dir/.file.o.cmd, look for deps_ line to |
295 | * figure out source file. */ | 304 | * figure out source file. */ |
@@ -420,7 +429,8 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) | |||
420 | while ((fname = strsep(&sources, " ")) != NULL) { | 429 | while ((fname = strsep(&sources, " ")) != NULL) { |
421 | if (!*fname) | 430 | if (!*fname) |
422 | continue; | 431 | continue; |
423 | if (!parse_source_files(fname, &md)) | 432 | if (!(is_static_library(fname)) && |
433 | !parse_source_files(fname, &md)) | ||
424 | goto release; | 434 | goto release; |
425 | } | 435 | } |
426 | 436 | ||