diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-02-08 03:15:40 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-02-08 03:15:40 +0000 |
| commit | 56efa5682bf1cc9c33ab70335f33307aa06eaca5 (patch) | |
| tree | c083bf81d4ace21e23f8c23e14d68dcb08fa927e /security/nss/cmd | |
| parent | b57cd40d45ceffe32c6c1eb6345b505d51fdd346 (diff) | |
| download | nss-hg-56efa5682bf1cc9c33ab70335f33307aa06eaca5.tar.gz | |
Bugzilla bug 124318: do not link with -lsoftokn3 explicitly. Use the
-rpath-link linker option on Linux to find libsoftokn3.so.
Diffstat (limited to 'security/nss/cmd')
| -rw-r--r-- | security/nss/cmd/platlibs.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index f6ebce08d..04e010177 100644 --- a/security/nss/cmd/platlibs.mk +++ b/security/nss/cmd/platlibs.mk @@ -170,11 +170,16 @@ ifeq ($(OS_ARCH), AIX) EXTRA_SHARED_LIBS += -brtl endif +# On Linux we must use the -rpath-link option to tell the linker +# where to find libsoftokn3.so, an implicit dependency of libnss3.so. +ifeq ($(OS_ARCH), Linux) +EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib +endif + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ -L$(DIST)/lib/ \ - -lsoftokn3 \ -lssl3 \ -lsmime3 \ -lnss3 \ |