From 3689e807550f30b92a980e2d2f9d33b0ba8246e4 Mon Sep 17 00:00:00 2001 From: Brian Ward Date: Thu, 23 May 2024 11:44:49 -0400 Subject: [PATCH] Allow better customization of the LDFLAGS_TBB variable --- make/compiler_flags | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/make/compiler_flags b/make/compiler_flags index 2228dd37938..d6f41aec41b 100644 --- a/make/compiler_flags +++ b/make/compiler_flags @@ -309,18 +309,19 @@ CXXFLAGS_TBB ?= -I $(TBB_INC) else CXXFLAGS_TBB ?= -I $(TBB)/include endif -LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" # MacOS ld does not support --disable-new-dtags ifneq ($(OS),Darwin) - LDFLAGS_TBB += -Wl,--disable-new-dtags + LDFLAGS_TBB_DTAGS ?= -Wl,--disable-new-dtags endif # Windows LLVM/Clang does not support -rpath, but is not needed on Windows anyway ifneq ($(OS), Windows_NT) - LDFLAGS_TBB += -Wl,-rpath,"$(TBB_LIB)" + LDFLAGS_TBB_RPATH ?= -Wl,-rpath,"$(TBB_LIB)" endif +LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" $(LDFLAGS_TBB_DTAGS) $(LDFLAGS_TBB_RPATH) + LDLIBS_TBB ?= -ltbb else