Issue 6446102: [google] Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 6446102: [google] Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds

Can't Edit
Can't Publish+Mail
Start Review

Created:
11 years, 8 months ago by simonb

Modified:
11 years, 8 months ago

Reviewers:
Diego Novillo

CC:
gcc-patches_gcc.gnu.org

Base URL:
svn+ssh://gcc.gnu.org/svn/gcc/branches/google/main/

Visibility:
Public.

Patch Set 1 #

Created: 11 years, 8 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+0 lines, -6 lines)			Patch
	M	Makefile.in	View		1 chunk	+0 lines, -3 lines	0 comments	Download
	M	Makefile.tpl	View		1 chunk	+0 lines, -3 lines	0 comments	Download

Messages

Total messages: 2

Expand All Messages | Collapse All Messages

simonb

Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds. A second occurrence of adding TARGET_LIB_PATH ...

11 years, 8 months ago (2012-08-08 15:49:01 UTC) #1

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.


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;
 

--
This patch is available for review at http://codereview.appspot.com/6446102

Diego Novillo

11 years, 8 months ago (2012-08-08 16:01:46 UTC) #2

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.

Expand All Messages | Collapse All Messages