From: <sol...@co...> - 2007-06-13 21:23:01
|
# HG changeset patch # User Ben Taylor <sol...@co...> # Date 1181765825 14400 # Node ID 9a9f611ddc53df7590d8ee518dd7018ab1d4b98d # Parent 01a00843f8f4ea89628c760d0a8dec8d12e2cf8d Clean up solaris PTHREAD_CFLAGS/PTHREAD_LIBS diff -r 9a9f611ddc53df7590d8ee518dd7018ab1d4b98d -r 01a00843f8f4ea89628c760d0a8dec8d12e2cf8d m4/pthreads.m4 --- a/m4/pthreads.m4 Wed Jun 13 16:17:05 2007 -0400 +++ b/m4/pthreads.m4 Wed Jun 13 15:08:17 2007 +0200 @@ -22,7 +22,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ *-darwin*) PTHREAD_CFLAGS="" ;; *-solaris*) # Handle Studio compiler - CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt -D_REENTRANT"], [PTHREAD_CFLAGS="-D_REENTRANT"]);; + CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt"]);; *) PTHREAD_CFLAGS="-pthread" ;; esac fi @@ -31,8 +31,8 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ *-hpux11*) PTHREAD_LIBS="-lpthread" ;; *-darwin*) PTHREAD_LIBS="" ;; *-solaris*) - # Handle Studio compiler - CC_CHECK_CFLAGS([-mt], [PTHREAD_LIBS="-lpthread -lposix4 -lrt"], [PTHREAD_LIBS="-lpthread -lposix4 -lrt"]);; + # Use the same libraries for gcc and sun studio cc + PTHREAD_LIBS="-lpthread -lposix4 -lrt";; *) PTHREAD_LIBS="-pthread" ;; esac fi |