diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-23 14:36:07 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-23 14:36:07 +0000 |
| commit | c335b5feeb574fa90f128db8259591419ce34d4a (patch) | |
| tree | 18675799e94c0f0b40a2f8d9227ff0c0e7c1dc06 /gcc/lto-wrapper.c | |
| parent | c7000751d67b66d966d4d3afa09c09d32a3805a8 (diff) | |
| download | gcc-c335b5feeb574fa90f128db8259591419ce34d4a.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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159760 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/lto-wrapper.c')
| -rw-r--r-- | gcc/lto-wrapper.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); |