558b7add843ea390720b3ece35642c56ae29a5b0 hiram Wed Nov 6 15:32:41 2013 -0800 can use static libstdc++.a and librt.a when on hgwdev refs #12005 diff --git src/inc/common.mk src/inc/common.mk index 788ce1f..f642afe 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -157,35 +157,39 @@ 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 endif # $(info have MYSQLINC: ${MYSQLINC}) # $(info have MYSQLLIBS: ${MYSQLLIBS}) # OK to add -lstdc++ to all MYSQLLIBS just in case it is # MySQL version 5.6 libraries, but no 'librt' on Mac OSX +ifeq (${FULLWARN},hgwdev) + MYSQLLIBS += /usr/lib/gcc/x86_64-redhat-linux/4.4.4/libstdc++.a /usr/lib/debug/usr/lib64/librt.a +else ifeq ($(UNAME_S),Darwin) MYSQLLIBS += -lstdc++ else MYSQLLIBS += -lstdc++ -lrt endif +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