procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cppinit.c (output_deps): Correct test for stdout output.

Browse source 
* cppinit.c (output_deps): Correct test for stdout output.
	(init_dependency_output): Cure warning.

From-SVN: r49993
This commit is contained in:
Neil Booth 2002-02-23 13:42:40 +00:00 • committed by Neil Booth
parent ac6f8a15d8
commit ab8e22289c
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/ChangeLog
View file

@ -1,3 +1,8 @@
2002-02-23 Neil Booth <neil@daikokuya.demon.co.uk>
* cppinit.c (output_deps): Correct test for stdout output.
(init_dependency_output): Cure warning.
Sat Feb 23 08:42:47 2002 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* expr.c (store_expr): When converting expression to promoted

14
gcc/cppinit.c
View file

@ -1102,7 +1102,7 @@ output_deps (pfile)
deps_phony_targets (pfile->deps, deps_stream);
/* Don't close stdout. */
if (CPP_OPTION (pfile, deps_file))
if (deps_stream != stdout)
{
if (ferror (deps_stream) || fclose (deps_stream) != 0)
cpp_fatal (pfile, "I/O error on output");
@ -1875,16 +1875,16 @@ init_dependency_output (pfile)
else
output_file = spec;
/* Command line -MF overrides environment variables and default. */
if (CPP_OPTION (pfile, deps_file) == 0)
CPP_OPTION (pfile, deps_file) = output_file;
CPP_OPTION (pfile, print_deps_append) = 1;
}
else
else if (CPP_OPTION (pfile, deps_file) == 0)
/* If -M or -MM was seen, default output to wherever was specified
with -o. out_fname is non-NULL here. */
output_file = CPP_OPTION (pfile, out_fname);
/* Command line -MF overrides environment variables and default. */
if (CPP_OPTION (pfile, deps_file) == 0)
CPP_OPTION (pfile, deps_file) = output_file;
CPP_OPTION (pfile, deps_file) = CPP_OPTION (pfile, out_fname);
/* When doing dependencies, we should suppress all output, including
-dM, -dI etc. */