diff options
Diffstat (limited to 'scripts/kconfig/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 249a3195e..2f7fa6618 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
| @@ -584,15 +584,24 @@ int conf_write(const char *name) | |||
| 584 | fclose(out); | 584 | fclose(out); |
| 585 | if (out_h) { | 585 | if (out_h) { |
| 586 | fclose(out_h); | 586 | fclose(out_h); |
| 587 | #ifdef __MINGW32__ | ||
| 588 | unlink("include/autoconf.h"); | ||
| 589 | #endif | ||
| 587 | rename(".tmpconfig.h", "include/autoconf.h"); | 590 | rename(".tmpconfig.h", "include/autoconf.h"); |
| 588 | } | 591 | } |
| 589 | if (!name || basename != conf_def_filename) { | 592 | if (!name || basename != conf_def_filename) { |
| 590 | if (!name) | 593 | if (!name) |
| 591 | name = conf_def_filename; | 594 | name = conf_def_filename; |
| 592 | sprintf(tmpname, "%s.old", name); | 595 | sprintf(tmpname, "%s.old", name); |
| 596 | #ifdef __MINGW32__ | ||
| 597 | unlink(tmpname); | ||
| 598 | #endif | ||
| 593 | rename(name, tmpname); | 599 | rename(name, tmpname); |
| 594 | } | 600 | } |
| 595 | sprintf(tmpname, "%s%s", dirname, basename); | 601 | sprintf(tmpname, "%s%s", dirname, basename); |
| 602 | #ifdef __MINGW32__ | ||
| 603 | unlink(tmpname); | ||
| 604 | #endif | ||
| 596 | if (rename(newname, tmpname)) | 605 | if (rename(newname, tmpname)) |
| 597 | return 1; | 606 | return 1; |
| 598 | 607 | ||
