Honor $MAKE for -fwhopr=; do not honor $MAKEFLAGS, $MFLAGS.

gcc/:
	* lto-wrapper.c (run_gcc): Unset MAKEFLAGS and MFLAGS
	before calling make; allow override through $MAKE.
	* doc/invoke.texi (Optimize Options): Document override.

From-SVN: r159760
This commit is contained in:
Ralf Wildenhues 2010-05-23 14:36:07 +00:00 committed by Ralf Wildenhues
parent 7a955d6248
commit 5767217f7a
3 changed files with 14 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2010-05-23 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* lto-wrapper.c (run_gcc): Unset MAKEFLAGS and MFLAGS
before calling make; allow override through $MAKE.
* doc/invoke.texi (Optimize Options): Document override.
2010-05-23 Anatoly Sokolov <aesok@post.ru>
* config/rs6000/rs6000.c (rs6000_mode_dependent_address_p): New.

View File

@ -7459,7 +7459,8 @@ that otherwise would not fit in memory. This option enables
If you specify the optional @var{n} the link stage is executed in
parallel using @var{n} parallel jobs by utilizing an installed
@code{make} program.
@command{make} program. The environment variable @env{MAKE} may be
used to override the program used.
Disabled by default.

View File

@ -521,7 +521,12 @@ cont:
fprintf (mstream, " \\\n\t%s", output_names[i]);
fprintf (mstream, "\n");
fclose (mstream);
new_argv[0] = "make";
/* Avoid passing --jobserver-fd= and similar flags. */
putenv (xstrdup ("MAKEFLAGS="));
putenv (xstrdup ("MFLAGS="));
new_argv[0] = getenv ("MAKE");
if (!new_argv[0])
new_argv[0] = "make";
new_argv[1] = "-f";
new_argv[2] = makefile;
snprintf (jobs, 31, "-j%d", parallel);