diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-01-07 19:53:50 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <rwild@gcc.gnu.org> | 2010-01-07 19:53:50 +0000 |
| commit | 60a2e21391ffbe359b6100fd34cb4d19056a88cc (patch) | |
| tree | 0ac4f16657f5528b5b43ef17f515def666f230e4 | |
| parent | c8f4e43a8c80cc3262b91d969a5420da62dae306 (diff) | |
| download | gcc-60a2e21391ffbe359b6100fd34cb4d19056a88cc.zip gcc-60a2e21391ffbe359b6100fd34cb4d19056a88cc.tar.gz gcc-60a2e21391ffbe359b6100fd34cb4d19056a88cc.tar.bz2 | |
re PR bootstrap/41818 (Error building cross compiler caused by changing LD_LIBRARY_PATH environment variable in Makefile)
Fix PR bootstrap/41818.
/:
PR bootstrap/41818
* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
to $(RPATH_ENVVAR) if bootstrapping. Fix typo in comment.
* Makefile.in: Regenerate.
From-SVN: r155706
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | Makefile.tpl | 7 |
3 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2010-01-07 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR bootstrap/41818 + * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH + to $(RPATH_ENVVAR) if bootstrapping. Fix typo in comment. + * Makefile.in: Regenerate. + 2010-01-02 Richard Guenther <rguenther@suse.de> PR lto/41529 diff --git a/Makefile.in b/Makefile.in index e5fa1d3..6f1c140 100644 --- a/Makefile.in +++ b/Makefile.in @@ -259,7 +259,7 @@ TARGET_SUBDIR = @target_subdir@ # directories built for the target. TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" # This is the list of variables to export in the environment when -# configuring subdirectories for the host system. +# configuring subdirectories for the target system. BASE_TARGET_EXPORTS = \ $(BASE_EXPORTS) \ AR="$(AR_FOR_TARGET)"; export AR; \ @@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); +@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); RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ diff --git a/Makefile.tpl b/Makefile.tpl index 15102e5..ac62666 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -262,7 +262,7 @@ TARGET_SUBDIR = @target_subdir@ # directories built for the target. TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" # This is the list of variables to export in the environment when -# configuring subdirectories for the host system. +# configuring subdirectories for the target system. BASE_TARGET_EXPORTS = \ $(BASE_EXPORTS) \ AR="$(AR_FOR_TARGET)"; export AR; \ @@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); +@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); RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ |