bfe0a60efa02b404843bb9465cea04d6c056ceb6 hiram Tue May 8 09:15:10 2018 -0700 honor CC if set and watch out for SSL_DIR existing from user suggestion no redmine diff --git src/inc/common.mk src/inc/common.mk index 2ddd9dd..5f45b7b 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -1,16 +1,17 @@ -CC=gcc +# if CC is undefined, set it to gcc +CC?=gcc # to build on sundance: CC=gcc -mcpu=v9 -m64 ifeq (${COPT},) COPT=-O -g endif ifeq (${CFLAGS},) CFLAGS= endif ifeq (${MACHTYPE},) MACHTYPE:=$(shell uname -m) # $(info MACHTYPE was empty, set to: ${MACHTYPE}) endif ifneq (,$(findstring -,$(MACHTYPE))) # $(info MACHTYPE has - sign ${MACHTYPE}) MACHTYPE:=$(shell uname -m) # $(info MACHTYPE has - sign set to: ${MACHTYPE}) @@ -60,32 +61,34 @@ USE_HAL=1 endif endif endif ifeq (${USE_HAL},1) HALLIBS=${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halChain.a ${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halLiftover.a ${HALDIR}/lib/halLod.a ${HALDIR}/lib/halLib.a ${HALDIR}/lib/sonLib.a ${HALDIR}/lib/libhdf5_cpp.a ${HALDIR}/lib/libhdf5.a ${HALDIR}/lib/libhdf5_hl.a HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/inc endif # libssl: disabled by default ifneq (${SSL_DIR}, "/usr/include/openssl") ifneq ($(UNAME_S),Darwin) + ifneq ($(wildcard ${SSL_DIR}),) L+=-L${SSL_DIR}/lib endif + endif HG_INC+=-I${SSL_DIR}/include endif # on hgwdev, already using the static library with mysqllient. ifeq (${IS_HGWDEV},yes) L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 else L+=-lssl -lcrypto endif # autodetect where libm is installed ifeq (${MLIB},) ifneq ($(wildcard /usr/lib64/libm.a),) MLIB=/usr/lib64/libm.a endif endif