33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
# HG changeset patch
|
|
# Parent 796f0564feb6df3081b8ff7cb3a0d354053b3d2c
|
|
Index: security/nss/cmd/platlibs.mk
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
|
|
retrieving revision 1.71
|
|
|
|
diff --git a/cmd/platlibs.mk b/cmd/platlibs.mk
|
|
--- a/cmd/platlibs.mk
|
|
+++ b/cmd/platlibs.mk
|
|
@@ -13,19 +13,19 @@ ifeq ($(USE_64), 1)
|
|
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
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH), Linux)
|
|
ifeq ($(USE_64), 1)
|
|
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
|
|
+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
|
|
else
|
|
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
|
|
+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
|
|
endif
|
|
endif
|
|
|
|
endif # BUILD_SUN_PKG
|
|
|
|
ifdef NSS_DISABLE_DBM
|
|
DBMLIB = $(NULL)
|
|
else
|