90efa7bc7857fc7e1c1fde91be372e8bde40dc66 hiram Tue Sep 24 13:11:57 2013 -0700 missing UNAME_S variable setting refs #11792 diff --git src/inc/common.mk src/inc/common.mk index 06899b6..15f7f7d 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -121,30 +121,33 @@ 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 + +UNAME_S := $(shell uname -s) + # 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