From bb19e2ea279a1e4c4901d58d8a0f69393dc51511 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Sat, 18 Nov 2000 20:58:43 +0000 Subject: [PATCH] * Makefile.in (HOST_LIB_PATH, TARGET_LIB_PATH): New macros. (REALLY_SET_LIB_PATH): Use them. --- ChangeLog | 5 +++++ Makefile.in | 17 +++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e3f7890f..10edead81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 18 18:57:50 2000 Alexandre Oliva + + * Makefile.in (HOST_LIB_PATH, TARGET_LIB_PATH): New macros. + (REALLY_SET_LIB_PATH): Use them. + Mon Nov 6 14:19:35 2000 Christopher Faylor * config.sub: Add support for Sun Chorus diff --git a/Makefile.in b/Makefile.in index 68b421bfa..7dbe789a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -186,14 +186,19 @@ SET_LIB_PATH = # the libraries. This may be changed by configure.in. RPATH_ENVVAR = LD_LIBRARY_PATH +# This is the list of directories that may be needed in RPATH_ENVVAR +# so that programs built for the host machine work. +HOST_LIB_PATH = $$r/bfd:$$r/opcodes + +# This is the list of directories that may be needed in RPATH_ENVVAR +# so that prorgams built for the target machine work. +TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libstdc++ + # configure.in sets SET_LIB_PATH to this if --enable-shared was used. +# Some platforms don't like blank entries, so we remove duplicate, +# leading and trailing colons. REALLY_SET_LIB_PATH = \ - if [ x"$$$(RPATH_ENVVAR)" != x ]; then \ - $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \ - else \ - $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes; \ - fi; \ - export $(RPATH_ENVVAR); + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); ALL = all.normal INSTALL_TARGET = installdirs \