From 2053a6a2f24dffc783657c9c4b278fc9312dd650 Mon Sep 17 00:00:00 2001 From: Rone Charles Date: Mon, 12 Jun 2017 11:01:41 -0400 Subject: [PATCH] Honor user-defined LDFLAGS making static libs a possibility --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7a94f9a..86ecb57 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ INC = $(SEQAN_INC) -I third_party CPP = g++ -w CXX = $(CPP) CC = gcc -LIBS = -lz +LIBS = $(LDFLAGS) -lz HEADERS = $(wildcard *.h) BOWTIE_MM = 1 BOWTIE_SHARED_MEM = 1 @@ -91,7 +91,12 @@ ifeq (1,$(NO_SPINLOCK)) endif ifneq (1,$(NO_TBB)) - LIBS += $(PTHREAD_LIB) -ltbb -ltbbmalloc_proxy + LIBS += $(PTHREAD_LIB) -ltbb + ifeq (1, $(RELEASE_BIN)) + LIBS += -ltbbmalloc + else + LIBS += -ltbbmalloc_proxy + endif override EXTRA_FLAGS += -DWITH_TBB else LIBS += $(PTHREAD_LIB)