diff options
| author | wtc%netscape.com <devnull@localhost> | 2003-03-27 01:17:28 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2003-03-27 01:17:28 +0000 |
| commit | 1480d4d254652d11ab76395e9a8b43babcb2cbf9 (patch) | |
| tree | def0e007d3bcd3d9662476bddbceee4a972d7e4c | |
| parent | ec217a4f5742fbd5d04ddef916adbde548bf02d3 (diff) | |
| download | nss-hg-1480d4d254652d11ab76395e9a8b43babcb2cbf9.tar.gz | |
Bug 199134: fixed build failures on FreeBSD. We need to specify -pthread
when linking an executable (already doing that when linking a shared lib),
and we need to use the -rpath-link flag to help the linker find the
shared libraries that we indirectly link with. r=cls.
Modified Files: coreconf/FreeBSD.mk nss/cmd/platlibs.mk
| -rw-r--r-- | security/coreconf/FreeBSD.mk | 1 | ||||
| -rw-r--r-- | security/nss/cmd/platlibs.mk | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/security/coreconf/FreeBSD.mk b/security/coreconf/FreeBSD.mk index c07df1a6c..7fc55c6e3 100644 --- a/security/coreconf/FreeBSD.mk +++ b/security/coreconf/FreeBSD.mk @@ -57,6 +57,7 @@ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) ifndef CLASSIC_NSPR USE_PTHREADS = 1 DEFINES += -D_THREAD_SAFE -D_REENTRANT +OS_LIBS += -pthread DSO_LDOPTS += -pthread endif diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index 6a6303604..4a9953461 100644 --- a/security/nss/cmd/platlibs.mk +++ b/security/nss/cmd/platlibs.mk @@ -189,6 +189,10 @@ ifeq ($(OS_ARCH), BSD_OS) EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib endif +ifeq ($(OS_ARCH), FreeBSD) +EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib +endif + ifeq ($(OS_ARCH), Darwin) EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif |