aboutsummaryrefslogtreecommitdiff
path: root/gcc/lto-wrapper.c
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-05-23 14:36:07 +0000
committerRalf Wildenhues <rwild@gcc.gnu.org>2010-05-23 14:36:07 +0000
commit5767217f7a8fccf90d601b652dd80793763ee6d2 (patch)
tree18675799e94c0f0b40a2f8d9227ff0c0e7c1dc06 /gcc/lto-wrapper.c
parent7a955d6248f8cf05e0218a06906a85372bd7bc4f (diff)
downloadgcc-5767217f7a8fccf90d601b652dd80793763ee6d2.zip
gcc-5767217f7a8fccf90d601b652dd80793763ee6d2.tar.gz
gcc-5767217f7a8fccf90d601b652dd80793763ee6d2.tar.bz2
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
Diffstat (limited to 'gcc/lto-wrapper.c')
-rw-r--r--gcc/lto-wrapper.c7
1 files changed, 6 insertions, 1 deletions
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);