From 4d01e3e3411c9bf98408fafc9145aa0b60b0a531 Mon Sep 17 00:00:00 2001 From: Brian Ward Date: Thu, 28 Sep 2023 14:19:22 -0400 Subject: [PATCH] Don't duplicate -rpath for TBB --- make/compiler_flags | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/compiler_flags b/make/compiler_flags index 1552381f232..df391fd5810 100644 --- a/make/compiler_flags +++ b/make/compiler_flags @@ -257,8 +257,8 @@ else CXXFLAGS_TBB ?= -I $(TBB)/include endif -LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -Wl,--disable-new-dtags -ltbb -LDLIBS_TBB ?= $(LDFLAGS_TBB) +LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -Wl,--disable-new-dtags +LDLIBS_TBB ?= -ltbb else @@ -276,7 +276,7 @@ endif CXXFLAGS_TBB ?= -I $(TBB)/include LDFLAGS_TBB ?= -Wl,-L,"$(TBB_BIN_ABSOLUTE_PATH)" -Wl,-rpath,"$(TBB_BIN_ABSOLUTE_PATH)" $(LDFLAGS_FLTO_FLTO) $(LDFLAGS_OPTIM_TBB) -LDLIBS_TBB ?= $(LDFLAGS_TBB) +LDLIBS_TBB ?= -ltbb endif