diff options
| author | simonb <simonb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-07 14:48:44 +0000 |
|---|---|---|
| committer | simonb <simonb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-07 14:48:44 +0000 |
| commit | b36add5bd01589bddf6a1b7e43c35bc775dd3d8a (patch) | |
| tree | dc2a2fe9fb092df19236feaae2ce909599f99206 | |
| parent | fbc2a497d713d054fbde43dbb531c350771ec324 (diff) | |
* Makefile.tpl: Omit TARGET_LIB_PATH from RPATH_ENVVAR set in
HOST_EXPORTS on bootstrap builds.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/google/gcc-4_7-integration@190205 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.google-integration | 10 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | Makefile.tpl | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog.google-integration b/ChangeLog.google-integration index 7db5be553c5..a0ca0e7a023 100644 --- a/ChangeLog.google-integration +++ b/ChangeLog.google-integration @@ -1,3 +1,13 @@ +2012-08-07 Simon Baldwin <simonb@google.com> + + Cherry pick r190203. + + 2012-08-07 Simon Baldwin <simonb@google.com> + + * Makefile.tpl: Omit TARGET_LIB_PATH from RPATH_ENVVAR set in + HOST_EXPORTS on bootstrap builds. + * Makefile.in: Regenerate. + 2012-05-09 Simon Baldwin <simonb@google.com> * libstdc++-v3/acinclude.m4: Bracket _GLIBCXX_USE_FLOAT128 diff --git a/Makefile.in b/Makefile.in index 4b991391572..375771d1504 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 = \ diff --git a/Makefile.tpl b/Makefile.tpl index 371c3b6f7db..48be2b12675 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -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 = \ |