From 3a4296cd4e9af691e5b843cf457c495f8df91bb7 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 6 Feb 2003 22:00:20 +0000 Subject: [PATCH] Changed the definition of SHRLIB_SEARCH_DIRS to be the actual dir searched Added implementation for solaris-sparc --- configure/os/CONFIG.Common.linux-x86 | 4 ++-- configure/os/CONFIG.Common.solaris-sparc | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure/os/CONFIG.Common.linux-x86 b/configure/os/CONFIG.Common.linux-x86 index d6f711da8..1cc8aa0bc 100644 --- a/configure/os/CONFIG.Common.linux-x86 +++ b/configure/os/CONFIG.Common.linux-x86 @@ -30,8 +30,8 @@ ARCH_DEP_CPPFLAGS += -D_X86_ ARCH_DEP_CFLAGS += -mcpu=pentium # Set runtime path for shared libraries -DIR_LDFLAGS_YES += $(sort $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%/lib/$(T_A))) -SHRLIB_LDFLAGS += $(sort $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%/lib/$(T_A))) +SHRLIB_LDFLAGS += $(sort $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)) +DIR_LDFLAGS_YES += $(sort $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)) DIR_LDFLAGS += $(DIR_LDFLAGS_$(SHARED_LIBRARIES)) ifdef CROSS diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc index 844d818e0..423b77baa 100644 --- a/configure/os/CONFIG.Common.solaris-sparc +++ b/configure/os/CONFIG.Common.solaris-sparc @@ -32,9 +32,10 @@ OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) # socket and nsl needed by libca.a OP_SYS_LDLIBS += -lsocket -lnsl -# -R does not work unless full path names are specified -# use loader's -R option -DIR_LDFLAGS += $(sort $(DEPLIB_DIRS:%=-R%)) +# Set runtime path for shared libraries +SHRLIB_LDFLAGS += $(sort $(SHRLIB_SEARCH_DIRS:%=-R%)) +DIR_LDFLAGS_YES += $(sort $(SHRLIB_SEARCH_DIRS:%=-R%)) +DIR_LDFLAGS += $(DIR_LDFLAGS_$(SHARED_LIBRARIES)) ifdef CROSS GNU_TARGET=sparc-sun-solaris2