summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwchang0222%aol.com <devnull@localhost>2004-05-27 02:42:06 +0000
committerwchang0222%aol.com <devnull@localhost>2004-05-27 02:42:06 +0000
commit8de42a9c5d4f1f00fce38012037342ff602c92c8 (patch)
tree26aed880421fce5e714c8bf3b227e8d369ef8db1
parentaa691ce45dc111e5de19aaae11bf2315c8cdc16d (diff)
downloadnspr-hg-8de42a9c5d4f1f00fce38012037342ff602c92c8.tar.gz
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
-rw-r--r--lib/ds/Makefile.in3
-rw-r--r--lib/libc/src/Makefile.in3
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
index 9f0c7b8d..516e1a37 100644
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -97,6 +97,9 @@ 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)
diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
index 21d5fd1f..162b3ed9 100644
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -107,6 +107,9 @@ 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)