55d5adaedccc1c67ce8a8a155ef36acf79c1ed2f max Tue Aug 14 02:04:59 2018 -0700 changing to default librt (static glibc part provided by centos), refs #21906 diff --git src/inc/common.mk src/inc/common.mk index 01d996a..b38bdb7 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -227,31 +227,31 @@ $(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 (${IS_HGWDEV},yes) - MYSQLLIBS += /usr/lib/gcc/x86_64-redhat-linux/4.8.5/libstdc++.a /usr/lib/x86_64-redhat-linux6E/lib64/librt.a + MYSQLLIBS += /usr/lib/gcc/x86_64-redhat-linux/4.8.5/libstdc++.a /usr/lib64/librt.a else ifeq ($(UNAME_S),Darwin) MYSQLLIBS += -lstdc++ else MYSQLLIBS += -lstdc++ -lrt endif endif ifeq (${ZLIB},) ZLIB=-lz ifneq ($(wildcard /opt/local/lib/libz.a),) ZLIB=/opt/local/lib/libz.a endif ifneq ($(wildcard /usr/lib64/libz.a),) ZLIB=/usr/lib64/libz.a