Skip to content

Commit 11b3aff

Browse files
authored
Merge pull request #2952 from stan-dev/fix/double-rpath
Don't duplicate -rpath for TBB
2 parents 617ae34 + c6e1396 commit 11b3aff

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

make/compiler_flags

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ else
272272
CXXFLAGS_TBB ?= -I $(TBB)/include
273273
endif
274274

275-
LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -Wl,--disable-new-dtags -ltbb
276-
LDLIBS_TBB ?= $(LDFLAGS_TBB)
275+
LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -Wl,--disable-new-dtags
276+
LDLIBS_TBB ?= -ltbb
277277

278278
else
279279

@@ -291,7 +291,7 @@ endif
291291

292292
CXXFLAGS_TBB ?= -I $(TBB)/include
293293
LDFLAGS_TBB ?= -Wl,-L,"$(TBB_BIN_ABSOLUTE_PATH)" -Wl,-rpath,"$(TBB_BIN_ABSOLUTE_PATH)" $(LDFLAGS_FLTO_FLTO) $(LDFLAGS_OPTIM_TBB)
294-
LDLIBS_TBB ?= $(LDFLAGS_TBB)
294+
LDLIBS_TBB ?= -ltbb
295295

296296
endif
297297

0 commit comments

Comments
 (0)