diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/doc/invoke.texi | 3 | ||||
| -rw-r--r-- | gcc/lto-wrapper.c | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a7a7743..c892795 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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. diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index c3e2d37..dbde14d 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -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. diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index 3dbd96b..f114dc6 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -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); |