Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow better customization of the LDFLAGS_TBB variable #3079

Merged
merged 1 commit into from
May 23, 2024
Merged

Allow better customization of the LDFLAGS_TBB variable #3079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Allow better customization of the LDFLAGS_TBB variable
  • Loading branch information
@WardBrian
WardBrian committed May 23, 2024
commit 3689e807550f30b92a980e2d2f9d33b0ba8246e4
7 changes: 4 additions & 3 deletions make/compiler_flags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down