65b4319455ab1c6f613eec5686677117d82d5a37 jcasper Fri Jun 27 14:09:25 2025 -0700 Moved libcurl to the list of always-dynamically-linked libraries, as static wasn't working out for the utils build. refs #35988 diff --git src/inc/common.mk src/inc/common.mk index 33232fd2c7e..b547e6e5d0e 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -372,40 +372,40 @@ ifneq (${SSLLIB},) L+=${SSLLIB} else L+=-lssl endif ifneq (${CRYPTOLIB},) L+=${CRYPTOLIB} else L+=-lcrypto endif endif endif #global external libraries L += $(kentSrc)/htslib/libhts.a -L+=${PNGLIB} ${MLIB} ${ZLIB} ${BZ2LIB} ${ICONVLIB} -lcurl +L+=${PNGLIB} ${MLIB} ${ZLIB} ${BZ2LIB} ${ICONVLIB} HG_INC+=${PNGINCL} # NOTE: these must be last libraries and must be dynamic. # We switched by to dynamic with SEMI_STATIC ifeq (${SEMI_STATIC},yes) # switch back to dynamic libraries DYNAMIC_PRE = -Wl,-Bdynamic endif -DYNAMIC_LIBS = ${DYNAMIC_PRE} -ldl -lm -lc +DYNAMIC_LIBS = ${DYNAMIC_PRE} -ldl -lm -lc -lcurl L+= ${DYNAMIC_LIBS} # pass through COREDUMP ifneq (${COREDUMP},) HG_DEFS+=-DCOREDUMP endif # autodetect UCSC additional source code with password for some external tracks on gbib GBIBDIR = /hive/groups/browser/gbib/ ifneq ($(wildcard ${GBIBDIR}/*.c),) HG_DEFS+=-DUSE_GBIB_PWD HG_INC += -I${GBIBDIR} endif