diff options
| author | neil.williams%sun.com <devnull@localhost> | 2006-11-17 02:13:16 +0000 |
|---|---|---|
| committer | neil.williams%sun.com <devnull@localhost> | 2006-11-17 02:13:16 +0000 |
| commit | b89ec64f35079f22b810481ecd100bd5b0b0ed5d (patch) | |
| tree | 1c7170e356d1f78df1ce74b16a3684488960f29f | |
| parent | 3616e1f6cbd49d9a97698fe64e0d3257cca2eea2 (diff) | |
| download | nss-hg-b89ec64f35079f22b810481ecd100bd5b0b0ed5d.tar.gz | |
Bug 360818; add RPATH to signtool, signver; r=Wan-Teh, NelsonNSS_3_11_4_RTMMOZILLA_1_9a1_RELEASEMOZILLA_1_9a1_RC3MOZILLA_1_9a1_RC2MOZILLA_1_9a1_RC1
| -rw-r--r-- | security/nss/cmd/platlibs.mk | 71 |
1 files changed, 37 insertions, 34 deletions
diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index 8deb8a40d..be588f440 100644 --- a/security/nss/cmd/platlibs.mk +++ b/security/nss/cmd/platlibs.mk @@ -35,6 +35,43 @@ # # ***** END LICENSE BLOCK ***** +# 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. + +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 +EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib' +endif +endif + +ifeq ($(OS_ARCH), Linux) +ifeq ($(USE_64), 1) +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' +else +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' +endif +endif + +ifeq ($(OS_ARCH), HP-UX) +ifeq ($(OS_TEST), ia64) +EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib' +else +# pa-risc +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 + ifdef USE_STATIC_LIBS @@ -188,40 +225,6 @@ 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/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 - -ifeq ($(OS_ARCH), Linux) -ifeq ($(USE_64), 1) -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -else -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -endif -endif - -ifeq ($(OS_ARCH), HP-UX) -ifeq ($(OS_TEST), ia64) -EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib' -else -# pa-risc -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 - ifeq ($(OS_ARCH), Darwin) EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif |