From 01a88d3557518085b013f14551f641a7dbddf25c Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Sat, 10 Nov 2012 18:32:23 +0000 Subject: [PATCH] re PR driver/55202 (Building a combined tree is broken for LTO) 2012-11-10 Andrew Pinski PR bootstrap/55202 * configure.ac: Set PLUGIN_LD_SUFFIX to just "ld" if it was "ld-new" or "collect-ld". * configure: Regenerate. From-SVN: r193393 --- gcc/ChangeLog | 7 +++++++ gcc/configure | 6 ++++++ gcc/configure.ac | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 46f21e7..62b6bd5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-11-10 Andrew Pinski + + PR bootstrap/55202 + * configure.ac: Set PLUGIN_LD_SUFFIX to just "ld" if it was "ld-new" + or "collect-ld". + * configure: Regenerate. + 2012-11-10 Eric Botcazou * expr.c (store_field): Remove TYPE parameter. Remove block of code diff --git a/gcc/configure b/gcc/configure index 55164b6..673b908 100755 --- a/gcc/configure +++ b/gcc/configure @@ -21343,6 +21343,12 @@ fi ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld PLUGIN_LD_SUFFIX=`basename $gcc_cv_ld | sed -e "s,$target_alias-,,"` +# if the PLUGIN_LD is set ld-new, just have it as ld +# as that is the installed named. +if test x$PLUGIN_LD_SUFFIX == xld-new \ + || test x$PLUGIN_LD_SUFFIX == xcollect-ld ; then + PLUGIN_LD_SUFFIX=ld +fi # Check whether --with-plugin-ld was given. if test "${with_plugin_ld+set}" = set; then : diff --git a/gcc/configure.ac b/gcc/configure.ac index fbda2cc..e0e12c0 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2003,6 +2003,12 @@ fi]) ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld PLUGIN_LD_SUFFIX=`basename $gcc_cv_ld | sed -e "s,$target_alias-,,"` +# if the PLUGIN_LD is set ld-new, just have it as ld +# as that is the installed named. +if test x$PLUGIN_LD_SUFFIX == xld-new \ + || test x$PLUGIN_LD_SUFFIX == xcollect-ld ; then + PLUGIN_LD_SUFFIX=ld +fi AC_ARG_WITH(plugin-ld, [AS_HELP_STRING([[--with-plugin-ld=[ARG]]], [specify the plugin linker])], [if test x"$withval" != x; then -- 2.7.4