diff options
| -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 a0ca0e7a023..a75bfcf193f 100644 --- a/ChangeLog.google-integration +++ b/ChangeLog.google-integration @@ -1,3 +1,13 @@ +2012-08-08 Simon Baldwin <simonb@google.com> + + Cherry pick revision 190232. + + 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. + 2012-08-07 Simon Baldwin <simonb@google.com> Cherry pick r190203. diff --git a/Makefile.in b/Makefile.in index 375771d1504..eb16165d851 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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; diff --git a/Makefile.tpl b/Makefile.tpl index 48be2b12675..15a54a56ab0 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -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; |