Bugzilla bug 244095: link libplds4.so and libplc4.so with -R $ORIGIN on NSPRPUB_PRE_4_2_CLIENT_BRANCH
authorwchang0222%aol.com
Thu, 27 May 2004 02:42:06 +0000
branchNSPRPUB_PRE_4_2_CLIENT_BRANCH
changeset 3127 afb4cc35463f3911a7519698d326dcc05ebfbfc7
parent 3124 254c1dbd9f736f15f06e57929767aa170d02242e
child 3128 2f5252d8569d4448513ff4478191791d4f0d1032
child 3165 bea2e15aea336a327bf516ce2d823a3e54b10952
push idunknown
push userunknown
push dateunknown
bugs244095
Bugzilla bug 244095: link libplds4.so and libplc4.so with -R $ORIGIN on Solaris. The patch is contributed by Julien Pierre. r=wtc. Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH lib/ds/Makefile.in lib/libc/src/Makefile.in
lib/ds/Makefile.in
lib/libc/src/Makefile.in
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -92,16 +92,19 @@ ifdef NS_USE_GCC
 ifdef GCC_USE_GNU_LD
 MKSHLIB += -Wl,--version-script,$(MAPFILE)
 else
 MKSHLIB += -Wl,-M,$(MAPFILE)
 endif
 else
 MKSHLIB += -M $(MAPFILE)
 endif
+# The -R '$ORIGIN' linker option instructs this library to search for its
+# dependencies in the same directory where it resides.
+MKSHLIB += -R '$$ORIGIN'
 endif
 
 ifeq ($(OS_ARCH),OS2)
 MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
 GARBAGE += $(MAPFILE)
 MKSHLIB += $(MAPFILE)
 endif
 
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -102,16 +102,19 @@ ifdef NS_USE_GCC
 ifdef GCC_USE_GNU_LD
 MKSHLIB += -Wl,--version-script,$(MAPFILE)
 else
 MKSHLIB += -Wl,-M,$(MAPFILE)
 endif
 else
 MKSHLIB += -M $(MAPFILE)
 endif
+# The -R '$ORIGIN' linker option instructs this library to search for its
+# dependencies in the same directory where it resides.
+MKSHLIB += -R '$$ORIGIN'
 endif
 
 ifeq ($(OS_ARCH),OS2)
 MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
 GARBAGE += $(MAPFILE)
 MKSHLIB += $(MAPFILE)
 endif