Patchwork [google/main] Omit TARGET_LIB_PATH from RPATH_ENVVAR in HOST_EXPORTS on bootstrap builds (issue6441093)

login
register
mail settings
Submitter Simon Baldwin
Date Aug. 2, 2012, 11:37 a.m.
Message ID <20120802113733.544CFA0DC4@xoom.chi.corp.google.com>
Download mbox | patch
Permalink /patch/174736/
State New
Headers show

Comments

Simon Baldwin - Aug. 2, 2012, 11:37 a.m.
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  <simonb@google.com>

	* Makefile.tpl: Omit TARGET_LIB_PATH from RPATH_ENVVAR set in
	HOST_EXPORTS on bootstrap builds.
	* Makefile.in: Regenerate.



--
This patch is available for review at http://codereview.appspot.com/6441093
Diego Novillo - Aug. 7, 2012, 1:36 p.m.
On Thu, Aug 2, 2012 at 7:37 AM, Simon Baldwin <simonb@google.com> wrote:
> 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  <simonb@google.com>
>
>         * Makefile.tpl: Omit TARGET_LIB_PATH from RPATH_ENVVAR set in
>         HOST_EXPORTS on bootstrap builds.
>         * Makefile.in: Regenerate.

This is OK.

Does this belong in google/integration? Or will you be sending this
for trunk? If you're not going to be sending this to trunk, please put
it in google/integration.



Diego.

Patch

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 = \