Fix for 176705 - fix rpath on AMD64 platform. r=saul, sr=wtchang
authorjulien.pierre.bugs%sun.com
Wed, 09 Mar 2005 23:04:49 +0000
changeset 5526 b74db8a01588d471bc12f4b02cc9b5245322252c
parent 5525 d678bd5c27dab5c93ffd31c1d0704a1bc9203e2d
child 5527 f8d78a4b61aa9405cdf92c95402d5d9a42935690
push idunknown
push userunknown
push dateunknown
reviewerssaul, wtchang
bugs176705
Fix for 176705 - fix rpath on AMD64 platform. r=saul, sr=wtchang
security/nss/cmd/platlibs.mk
security/nss/lib/nss/config.mk
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -196,17 +196,17 @@ ifdef GCC_USE_GNU_LD
 EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
 endif
 endif
 endif
 
 ifeq ($(OS_ARCH), SunOS) 
 ifeq ($(BUILD_SUN_PKG), 1)
 ifeq ($(USE_64), 1)
-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/sparcv9:/usr/lib/mps/sparcv9'
+EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
 else
 EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
 endif
 else
 EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
 endif
 endif
 
--- a/security/nss/lib/nss/config.mk
+++ b/security/nss/lib/nss/config.mk
@@ -106,17 +106,17 @@ SHARED_LIBRARY_DIRS = \
 	$(NULL)
 
 
 ifeq ($(OS_TARGET),SunOS)
 ifeq ($(BUILD_SUN_PKG), 1)
 # The -R '$ORIGIN' linker option instructs this library to search for its
 # dependencies in the same directory where it resides.
 ifeq ($(USE_64), 1)
-MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1/sparcv9:/usr/lib/mps/sparcv9'
+MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
 else
 MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
 endif
 else
 MKSHLIB += -R '$$ORIGIN'
 endif
 endif