27ecfc24343e0d162187e820f24dd3f04aff1d9a hiram Fri Feb 7 12:04:48 2014 -0800 do not need the pthread business on the Mac it causes constant warnings refs #12209 diff --git src/inc/common.mk src/inc/common.mk index cd5f23f..2506dcb 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -6,31 +6,33 @@ ifeq (${CFLAGS},) CFLAGS= endif HG_DEFS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_${MACHTYPE} HG_INC=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc # to check for Mac OSX Darwin specifics: UNAME_S := $(shell uname -s) # to check for builds on hgwdev FULLWARN = $(shell uname -n) #global external libraries L= # pthreads is required +ifneq ($(UNAME_S),Darwin) L+=-pthread +endif # autodetect if openssl is installed ifeq (${SSLDIR},) SSLDIR = /usr/include/openssl endif ifeq (${USE_SSL},) ifneq ($(wildcard ${SSLDIR}),) USE_SSL=1 endif endif # autodetect UCSC installation of hal: ifeq (${HALDIR},) HALDIR = /hive/groups/browser/hal