diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-03-01 16:08:12 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-03-01 16:08:12 +0000 |
| commit | b48c8cd57a849e840d69e1ec7ecd08a16df18bd9 (patch) | |
| tree | 25160ef7c84de200c5e8c563e8e0938558532d81 | |
| parent | c1b93af9c8899d0b420155b976a8b0e354fc596c (diff) | |
| download | nss-hg-b48c8cd57a849e840d69e1ec7ecd08a16df18bd9.tar.gz | |
Bugzilla bug 112987: merged changes contributed by FreeBSD developer
Jeremy <reg@shale.csir.co.za>. r=wtc.
| -rw-r--r-- | security/coreconf/FreeBSD.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/security/coreconf/FreeBSD.mk b/security/coreconf/FreeBSD.mk index 5c23d86c4..c07df1a6c 100644 --- a/security/coreconf/FreeBSD.mk +++ b/security/coreconf/FreeBSD.mk @@ -43,19 +43,21 @@ RANLIB = ranlib ifeq ($(OS_TEST),alpha) CPU_ARCH = alpha else -OS_REL_CFLAGS = -Di386 CPU_ARCH = x86 endif -OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK +OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + +DSO_CFLAGS = -fPIC +DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) # # The default implementation strategy for FreeBSD is pthreads. # ifndef CLASSIC_NSPR USE_PTHREADS = 1 -DEFINES += -D_THREAD_SAFE -THREAD_FLAG = -pthread +DEFINES += -D_THREAD_SAFE -D_REENTRANT +DSO_LDOPTS += -pthread endif ARCH = freebsd @@ -68,11 +70,7 @@ else DLL_SUFFIX = so.1.0 endif -DSO_CFLAGS = -fPIC -DSO_LDOPTS = -Bshareable -DSO_LDFLAGS = - -MKSHLIB = $(LD) $(DSO_LDOPTS) +MKSHLIB = $(CC) $(DSO_LDOPTS) ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif |