918170c721d7af45509d4e3328dd6d9e6e904155 hiram Fri Aug 30 15:33:42 2013 -0700 no librt on Mac OSX compile refs #11616 diff --git src/inc/common.mk src/inc/common.mk index 3b5443e..1e149f9 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -121,32 +121,37 @@ endif ifeq (${MYSQLLIBS},) ifneq ($(wildcard /opt/local/lib/mysql55/mysql/libmysqlclient.a),) MYSQLLIBS=/opt/local/lib/mysql55/mysql/libmysqlclient.a endif endif ifeq ($(findstring src/hg/,${CURDIR}),src/hg/) ifeq (${MYSQLINC},) $(error can not find installed mysql development system) endif endif # last resort, hoping the compiler can find it in standard locations ifeq (${MYSQLLIBS},) MYSQLLIBS="-lmysqlclient" endif -# OK to add this to all MYSQLLIBS just in case it is MySQL version 5.6 libraries +# OK to add -lstdc++ to all MYSQLLIBS just in case it is +# MySQL version 5.6 libraries, but no 'librt' on Mac OSX +ifeq ($(UNAME_S),Darwin) + MYSQLLIBS += -lstdc++ +else MYSQLLIBS += -lstdc++ -lrt +endif L+=${PNGLIB} HG_INC+=${PNGINCL} # 32-bit color enabled by default ifneq (${COLOR32},0) HG_DEFS+=-DCOLOR32 endif # autodetect UCSC installation of samtabix: ifeq (${SAMTABIXDIR},) SAMTABIXDIR = /hive/data/outside/samtabix/${MACHTYPE} ifneq ($(wildcard ${SAMTABIXDIR}),) ifeq (${USE_SAMTABIX},) USE_SAMTABIX=1