Bug 667938, allow to disable the use of rpath at build time, patch by Mike Hommey, r=kaie
authorkaie%kuix.de
Thu, 21 Jun 2012 19:21:40 +0000
changeset 10390 0ad1a9e101fde20cfe089f8781e2c87b2148bcf1
parent 10389 d3cc1398045304080eadfa3d2c77a53cf8048877
child 10391 6f32bae686f9eaeb42fdd2b5bd36f887b6184746
push idunknown
push userunknown
push dateunknown
reviewerskaie
bugs667938
Bug 667938, allow to disable the use of rpath at build time, patch by Mike Hommey, r=kaie
security/nss/cmd/platlibs.mk
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -1,16 +1,17 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # set RPATH-type linker instructions here so they can be used in the shared
 # version and in the mixed (static nss libs/shared NSPR libs) version.
 
+ifndef DISABLE_RPATH
 ifeq ($(OS_ARCH), SunOS) 
 ifeq ($(BUILD_SUN_PKG), 1)
 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
 else
@@ -42,16 +43,17 @@ else
 ifeq ($(USE_64), 1)
 EXTRA_SHARED_LIBS += \
 -Wl,+b,'$$ORIGIN/../../lib/pa20_64:$$ORIGIN/../../lib/64:$$ORIGIN/../lib'
 else
 EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
 endif
 endif
 endif
+endif
 
 ifdef NSS_DISABLE_DBM
 DBMLIB = $(NULL)
 else
 DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) 
 endif
 
 ifdef USE_STATIC_LIBS