* Makefile.in (HOST_LIB_PATH, TARGET_LIB_PATH): New macros.

(REALLY_SET_LIB_PATH): Use them.
This commit is contained in:
Alexandre Oliva 2000-11-18 20:58:43 +00:00
parent fec7d8b0e7
commit 0da520102d
2 changed files with 16 additions and 6 deletions

View File

@ -1,3 +1,8 @@
Sat Nov 18 18:57:50 2000 Alexandre Oliva <aoliva@redhat.com>
* 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 <cgf@cygnus.com> Mon Nov 6 14:19:35 2000 Christopher Faylor <cgf@cygnus.com>
* config.sub: Add support for Sun Chorus * config.sub: Add support for Sun Chorus

View File

@ -186,14 +186,19 @@ SET_LIB_PATH =
# the libraries. This may be changed by configure.in. # the libraries. This may be changed by configure.in.
RPATH_ENVVAR = LD_LIBRARY_PATH 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. # 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 = \ REALLY_SET_LIB_PATH = \
if [ x"$$$(RPATH_ENVVAR)" != x ]; then \ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
$(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \
else \
$(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes; \
fi; \
export $(RPATH_ENVVAR);
ALL = all.normal ALL = all.normal
INSTALL_TARGET = installdirs \ INSTALL_TARGET = installdirs \