diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 18:08:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 18:08:09 -0500 |
| commit | 99273ac4dc4db0cfb38fec65d4afb8a0f6bc6e58 (patch) | |
| tree | 6300912c3322a6567f9091d8bfb8b0334f290d87 | |
| parent | 361821854b71fc3a53c9e17701538247bddbd4ba (diff) | |
| parent | b7bd182176960fdd139486cadb9962b39f8a2b50 (diff) | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
fixdep: Do not record dependency on the source file itself
| -rw-r--r-- | scripts/basic/fixdep.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index c9a16abacab4..6c94c6ce2925 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
| @@ -315,6 +315,7 @@ static void parse_dep_file(void *map, size_t len) | |||
| 315 | char *end = m + len; | 315 | char *end = m + len; |
| 316 | char *p; | 316 | char *p; |
| 317 | char s[PATH_MAX]; | 317 | char s[PATH_MAX]; |
| 318 | int first; | ||
| 318 | 319 | ||
| 319 | p = strchr(m, ':'); | 320 | p = strchr(m, ':'); |
| 320 | if (!p) { | 321 | if (!p) { |
| @@ -327,6 +328,7 @@ static void parse_dep_file(void *map, size_t len) | |||
| 327 | 328 | ||
| 328 | clear_config(); | 329 | clear_config(); |
| 329 | 330 | ||
| 331 | first = 1; | ||
| 330 | while (m < end) { | 332 | while (m < end) { |
| 331 | while (m < end && (*m == ' ' || *m == '\\' || *m == '\n')) | 333 | while (m < end && (*m == ' ' || *m == '\\' || *m == '\n')) |
| 332 | m++; | 334 | m++; |
| @@ -340,9 +342,17 @@ static void parse_dep_file(void *map, size_t len) | |||
| 340 | if (strrcmp(s, "include/generated/autoconf.h") && | 342 | if (strrcmp(s, "include/generated/autoconf.h") && |
| 341 | strrcmp(s, "arch/um/include/uml-config.h") && | 343 | strrcmp(s, "arch/um/include/uml-config.h") && |
| 342 | strrcmp(s, ".ver")) { | 344 | strrcmp(s, ".ver")) { |
| 343 | printf(" %s \\\n", s); | 345 | /* |
| 346 | * Do not output the first dependency (the | ||
| 347 | * source file), so that kbuild is not confused | ||
| 348 | * if a .c file is rewritten into .S or vice | ||
| 349 | * versa. | ||
| 350 | */ | ||
| 351 | if (!first) | ||
| 352 | printf(" %s \\\n", s); | ||
| 344 | do_config_file(s); | 353 | do_config_file(s); |
| 345 | } | 354 | } |
| 355 | first = 0; | ||
| 346 | m = p + 1; | 356 | m = p + 1; |
| 347 | } | 357 | } |
| 348 | printf("\n%s: $(deps_%s)\n\n", target, target); | 358 | printf("\n%s: $(deps_%s)\n\n", target, target); |