diff options
| author | cvs2hg <devnull@localhost> | 2007-01-17 18:58:59 +0000 |
|---|---|---|
| committer | cvs2hg <devnull@localhost> | 2007-01-17 18:58:59 +0000 |
| commit | 1a2baef5120a52411195a17d360a79e84a09797e (patch) | |
| tree | 0bf7f8e2bd360c94d835ca8226aea357927e9062 /security/nss/cmd/platlibs.mk | |
| parent | efc6ec73fd3a32a186e55ad5da2cb9e383c8676e (diff) | |
| download | nss-hg-SUNBIRD_0_5_RC1.tar.gz | |
fixup commit for branch 'GECKO181_20070501_RELBRANCH'THUNDERBIRD_2_0_0_4_RELEASETHUNDERBIRD_2_0_0_4_RC1THUNDERBIRD_2_0_0_0_RELEASETHUNDERBIRD_2_0_0_0_RC1SUNBIRD_0_5_RELEASESUNBIRD_0_5_RC1SEAMONKEY_1_1_2_RELEASESEAMONKEY_1_1_1_RELEASELIGHTNING_0_5_RELEASELIGHTNING_0_5_RC1FIREFOX_2_0_0_4_RELEASEFIREFOX_2_0_0_4_RC3FIREFOX_2_0_0_4_RC2FIREFOX_2_0_0_4_RC1FIREFOX_2_0_0_3_RELEASEFIREFOX_2_0_0_3_RC1FIREFOX_2_0_0_2_RELEASEFIREFOX_2_0_0_2_RC5FIREFOX_2_0_0_2_RC4FIREFOX_2_0_0_2_RC3FIREFOX_2_0_0_2_RC2FIREFOX_2_0_0_2_RC1CAMINO_1_5_RELEASECAMINO_1_1_B_RELEASE
Diffstat (limited to 'security/nss/cmd/platlibs.mk')
| -rw-r--r-- | security/nss/cmd/platlibs.mk | 59 |
1 files changed, 41 insertions, 18 deletions
diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index 57872e48b..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 @@ -136,6 +173,10 @@ EXTRA_SHARED_LIBS += \ -lnspr4 \ $(NULL) endif + +ifeq ($(OS_TARGET), SunOS) +OS_LIBS += -lbsm +endif endif else # USE_STATIC_LIBS @@ -184,24 +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), HP-UX) -ifeq ($(OS_TEST), ia64) -EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib' -endif -endif - ifeq ($(OS_ARCH), Darwin) EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif |