Merged a patch contributed by jon@eyrie.org (Jonathan Lennox).

nsprpub/config/FreeBSD.mk

@@ -33,16 +33,13 @@ CPU_ARCH		= x86
 endif
 CPU_ARCH_TAG		= _$(CPU_ARCH)
 
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
 
 ifeq ($(USE_PTHREADS),1)
 IMPL_STRATEGY		= _PTH
-OS_LIBS			= -lc_r
-DEFINES			+= -D_THREAD_SAFE
-OS_CFLAGS		+= -pthread
+THREAD_FLAG		+= -pthread
 else
 IMPL_STRATEGY		= _EMU
-OS_LIBS			= -lc
 DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
 endif