Patchwork [google] Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds (issue6446102)

login
register
mail settings
Submitter Simon Baldwin
Date Aug. 8, 2012, 3:49 p.m.
Message ID <20120808154900.77070A16EF@xoom.chi.corp.google.com>
Download mbox | patch
Permalink /patch/175942/
State New
Headers show

Comments

Simon Baldwin - Aug. 8, 2012, 3:49 p.m.
Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds.

A second occurrence of adding TARGET_LIB_PATH to LD_LIBRARY_PATH on gcc
bootstrap builds.  This one also needs removing to enable full test coverage.

Discussion and rationale at: http://gcc.gnu.org/ml/gcc/2012-06/msg00314.html

For google/main, google/gcc-4_7 and google/gcc-4_7-integration.  Tested for
bootstrap and regression.

2012-08-08  Simon Baldwin  <simonb@google.com>

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



--
This patch is available for review at http://codereview.appspot.com/6446102
Diego Novillo - Aug. 8, 2012, 4:01 p.m.
On 12-08-08 11:49 , Simon Baldwin wrote:
> Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds.
>
> A second occurrence of adding TARGET_LIB_PATH to LD_LIBRARY_PATH on gcc
> bootstrap builds.  This one also needs removing to enable full test coverage.
>
> Discussion and rationale at: http://gcc.gnu.org/ml/gcc/2012-06/msg00314.html
>
> For google/main, google/gcc-4_7 and google/gcc-4_7-integration.  Tested for
> bootstrap and regression.
>
> 2012-08-08  Simon Baldwin  <simonb@google.com>
>
> 	* Makefile.tpl: Omit another TARGET_LIB_PATH from RPATH_ENVVAR set
> 	on bootstrap builds.
> 	* Makefile.in: Regenerate.

OK, but I gotta ask again... shouldn't this be in google/integration? :)


Diego.

Patch

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 190231)
+++ Makefile.in	(working copy)
@@ -288,9 +288,6 @@  BASE_TARGET_EXPORTS = \
 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-@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); \
 	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS;
 
Index: Makefile.tpl
===================================================================
--- Makefile.tpl	(revision 190231)
+++ Makefile.tpl	(working copy)
@@ -291,9 +291,6 @@  BASE_TARGET_EXPORTS = \
 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-@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); \
 	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS;