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.

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

Fix ld error with TBB_LIB on macos #3070

Merged
merged 1 commit into from
May 16, 2024
Merged
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion make/compiler_flags
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,12 @@ CXXFLAGS_TBB ?= -I $(TBB_INC)
else
CXXFLAGS_TBB ?= -I $(TBB)/include
endif
LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" -Wl,--disable-new-dtags
LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)"

# MacOS ld does not support --disable-new-dtags
ifneq ($(OS),Darwin)
LDFLAGS_TBB += -Wl,--disable-new-dtags
endif

# Windows LLVM/Clang does not support -rpath, but is not needed on Windows anyway
ifneq ($(OS), Windows_NT)
Expand Down