diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-05-23 14:36:07 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <rwild@gcc.gnu.org> | 2010-05-23 14:36:07 +0000 |
| commit | 5767217f7a8fccf90d601b652dd80793763ee6d2 (patch) | |
| tree | 18675799e94c0f0b40a2f8d9227ff0c0e7c1dc06 | |
| parent | 7a955d6248f8cf05e0218a06906a85372bd7bc4f (diff) | |
| download | gcc-5767217f7a8fccf90d601b652dd80793763ee6d2.tar.gz | |
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
| -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 a7a77433a09..c8927954e4c 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 c3e2d37c7e8..dbde14d2206 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 3dbd96b7cbc..f114dc611e7 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); |