diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-01-07 20:00:52 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-01-07 20:00:52 +0000 |
| commit | 0f17154751075bbd30937dd8c857b35771f5b7bc (patch) | |
| tree | 5b749d9acf3c76759ff9e1925498d95c587fbc06 /Makefile.tpl | |
| parent | d50030786f21bfb5039440588286e529ed80c1c6 (diff) | |
| download | gdb-0f17154751075bbd30937dd8c857b35771f5b7bc.tar.gz | |
Sync from GCC: Makefile.tpl (BASE_TARGET_EXPORTS) fix
/:
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.
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 15102e58f67..ac62666d073 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) \ |