Omit TARGET_LIB_PATH from RPATH_ENVVAR in HOST_EXPORTS on bootstrap builds.
Discussion and rationale at: http://gcc.gnu.org/ml/gcc/2012-06/msg00314.html For google/main. Tested for bootstrap and regression. 2012-08-02 Simon Baldwin <sim...@google.com> * Makefile.tpl: Omit TARGET_LIB_PATH from RPATH_ENVVAR set in HOST_EXPORTS on bootstrap builds. * Makefile.in: Regenerate. Index: Makefile.in =================================================================== --- Makefile.in (revision 190013) +++ Makefile.in (working copy) @@ -225,9 +225,6 @@ HOST_EXPORTS = \ CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \ LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \ LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \ -@if gcc-bootstrap - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ -@endif gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); POSTSTAGE1_CXX_EXPORT = \ Index: Makefile.tpl =================================================================== --- Makefile.tpl (revision 190013) +++ Makefile.tpl (working copy) @@ -228,9 +228,6 @@ HOST_EXPORTS = \ CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \ LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \ LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \ -@if gcc-bootstrap - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ -@endif gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); POSTSTAGE1_CXX_EXPORT = \ -- This patch is available for review at http://codereview.appspot.com/6441093
