3c8a942f17a2fd17d3e86401c96ffd1ecc672034 markd Sat Jan 29 17:52:29 2011 -0800 OSTYPE is only an environment variable in tcsh, so explicty create a make variable SYS using uname diff --git src/inc/common.mk src/inc/common.mk index fd3d7a0..b93b4d1 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -67,36 +67,38 @@ ifeq (${USE_BAM},1) ifeq (${SAMINC},) SAMINC = ${SAMDIR} endif ifeq (${SAMLIB},) SAMLIB = ${SAMDIR}/libbam.a endif HG_INC += -I${SAMINC} L+=${SAMLIB} HG_DEFS+=-DUSE_BAM ifeq (${KNETFILE_HOOKS},1) HG_DEFS+=-DKNETFILE_HOOKS endif endif +SYS = $(shell uname -s) + ifeq (${HG_WARN},) - ifeq (darwin,$(findstring darwin,${OSTYPE})) + ifeq (${SYS},Darwin) HG_WARN = -Wall -Wno-unused-variable HG_WARN_UNINIT= else - ifeq (solaris,$(findstring solaris,${OSTYPE})) + ifeq (${SYS},SunOS) HG_WARN = -Wall -Wformat -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized else HG_WARN = -Wall -Werror -Wformat -Wimplicit -Wreturn-type # HG_WARN = -Wall -Wformat -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized endif endif # -Wuninitialized generates a warning without optimization ifeq ($(findstring -O,${COPT}),-O) HG_WARN += ${HG_WARN_UNINIT} endif endif # this is to hack around many make files not including HG_WARN in