mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2025-02-07 04:55:46 +00:00
Formerly main.c.~86~
This commit is contained in:
parent
00dc97cb8a
commit
55f5d979ae
1 changed files with 23 additions and 7 deletions
30
main.c
30
main.c
|
@ -413,8 +413,6 @@ main (argc, argv, envp)
|
||||||
PATH_VAR (current_directory);
|
PATH_VAR (current_directory);
|
||||||
char *directory_before_chdir;
|
char *directory_before_chdir;
|
||||||
|
|
||||||
mcheck();
|
|
||||||
|
|
||||||
default_goal_file = 0;
|
default_goal_file = 0;
|
||||||
reading_filename = 0;
|
reading_filename = 0;
|
||||||
reading_lineno_ptr = 0;
|
reading_lineno_ptr = 0;
|
||||||
|
@ -969,12 +967,17 @@ mcheck();
|
||||||
}
|
}
|
||||||
|
|
||||||
case 0:
|
case 0:
|
||||||
re_exec:;
|
re_exec:
|
||||||
/* Updated successfully. Re-exec ourselves. */
|
/* Updated successfully. Re-exec ourselves. */
|
||||||
|
|
||||||
|
remove_intermediates (0);
|
||||||
|
|
||||||
|
if (print_data_base_flag)
|
||||||
|
print_data_base ();
|
||||||
|
|
||||||
if (print_directory_flag)
|
if (print_directory_flag)
|
||||||
log_working_directory (0);
|
log_working_directory (0);
|
||||||
if (debug_flag)
|
|
||||||
puts ("Re-execing myself....");
|
|
||||||
if (makefiles != 0)
|
if (makefiles != 0)
|
||||||
{
|
{
|
||||||
/* These names might have changed. */
|
/* These names might have changed. */
|
||||||
|
@ -990,6 +993,7 @@ mcheck();
|
||||||
++j;
|
++j;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (directories != 0 && directories->idx > 0)
|
if (directories != 0 && directories->idx > 0)
|
||||||
{
|
{
|
||||||
char bad;
|
char bad;
|
||||||
|
@ -1008,8 +1012,7 @@ mcheck();
|
||||||
if (bad)
|
if (bad)
|
||||||
fatal ("Couldn't change back to original directory.");
|
fatal ("Couldn't change back to original directory.");
|
||||||
}
|
}
|
||||||
fflush (stdout);
|
|
||||||
fflush (stderr);
|
|
||||||
for (p = environ; *p != 0; ++p)
|
for (p = environ; *p != 0; ++p)
|
||||||
if (!strncmp (*p, "MAKELEVEL=", 10))
|
if (!strncmp (*p, "MAKELEVEL=", 10))
|
||||||
{
|
{
|
||||||
|
@ -1022,6 +1025,19 @@ mcheck();
|
||||||
sprintf (*p, "MAKELEVEL=%u", makelevel);
|
sprintf (*p, "MAKELEVEL=%u", makelevel);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (debug_flag)
|
||||||
|
{
|
||||||
|
char **p;
|
||||||
|
fputs ("Re-executing:", stdout);
|
||||||
|
for (p = argv; *p != 0; ++p)
|
||||||
|
printf (" %s", *p);
|
||||||
|
puts ("");
|
||||||
|
}
|
||||||
|
|
||||||
|
fflush (stdout);
|
||||||
|
fflush (stderr);
|
||||||
|
|
||||||
exec_command (argv, environ);
|
exec_command (argv, environ);
|
||||||
/* NOTREACHED */
|
/* NOTREACHED */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue