Bug 882173 - Define MOZ_USE_PTHREADS if we're using pthreads. r=gps

This commit is contained in:
Joe Drew 2013-06-12 15:19:54 -04:00
parent 14ceeb10b7
commit 5b42575a15

View File

@ -83,7 +83,7 @@ AC_PROG_AWK
dnl Initialize the Pthread test variables early so they can be dnl Initialize the Pthread test variables early so they can be
dnl overridden by each platform. dnl overridden by each platform.
dnl ======================================================== dnl ========================================================
USE_PTHREADS= MOZ_USE_PTHREADS=
_PTHREAD_LDFLAGS="" _PTHREAD_LDFLAGS=""
dnl Do not allow a separate objdir build if a srcdir build exists. dnl Do not allow a separate objdir build if a srcdir build exists.
@ -3156,17 +3156,17 @@ dnl = Start by checking whether the system support pthreads
dnl ======================================================== dnl ========================================================
case "$target_os" in case "$target_os" in
darwin*) darwin*)
USE_PTHREADS=1 MOZ_USE_PTHREADS=1
;; ;;
*) *)
MOZ_CHECK_PTHREADS(pthreads, MOZ_CHECK_PTHREADS(pthreads,
USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
MOZ_CHECK_PTHREADS(pthread, MOZ_CHECK_PTHREADS(pthread,
USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
MOZ_CHECK_PTHREADS(c_r, MOZ_CHECK_PTHREADS(c_r,
USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
MOZ_CHECK_PTHREADS(c, MOZ_CHECK_PTHREADS(c,
USE_PTHREADS=1 MOZ_USE_PTHREADS=1
) )
) )
) )
@ -3179,17 +3179,17 @@ dnl Check the command line for --with-pthreads
dnl ======================================================== dnl ========================================================
MOZ_ARG_WITH_BOOL(pthreads, MOZ_ARG_WITH_BOOL(pthreads,
[ --with-pthreads Force use of system pthread library with NSPR ], [ --with-pthreads Force use of system pthread library with NSPR ],
[ if test "$USE_PTHREADS"x = x; then [ if test "$MOZ_USE_PTHREADS"x = x; then
AC_MSG_ERROR([ --with-pthreads specified for a system without pthread support ]); AC_MSG_ERROR([ --with-pthreads specified for a system without pthread support ]);
fi], fi],
USE_PTHREADS= MOZ_USE_PTHREADS=
_PTHREAD_LDFLAGS= _PTHREAD_LDFLAGS=
) )
dnl ======================================================== dnl ========================================================
dnl Do the platform specific pthread hackery dnl Do the platform specific pthread hackery
dnl ======================================================== dnl ========================================================
if test "$USE_PTHREADS"x != x if test "$MOZ_USE_PTHREADS"x != x
then then
dnl dnl
dnl See if -pthread is supported. dnl See if -pthread is supported.
@ -3275,6 +3275,7 @@ then
;; ;;
esac esac
LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}" LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
AC_SUBST(MOZ_USE_PTHREADS)
fi fi