Skip to content

Skip --disable-new-dtags on Windows when TBB_LIB is set #3415

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

Open
jgabry wants to merge 1 commit into
base: develop
Choose a base branch
from
+5 −5
Open

Skip --disable-new-dtags on Windows when TBB_LIB is set #3415

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
10 changes: 5 additions & 5 deletions make/compiler_flags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,14 +296,14 @@ else
CXXFLAGS_TBB ?= $(INC_DIR_OPT) $(TBB)/include
endif

# MacOS ld does not support --disable-new-dtags
ifneq ($(OS),Darwin)
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_RPATH ?= -Wl,-rpath,"$(TBB_LIB)"
# --disable-new-dtags only matters alongside -rpath; MacOS ld does not
# support it
ifneq ($(OS),Darwin)
LDFLAGS_TBB_DTAGS ?= -Wl,--disable-new-dtags
endif
endif

LDFLAGS_TBB ?= -Wl,-L,"$(TBB_LIB)" $(LDFLAGS_TBB_DTAGS) $(LDFLAGS_TBB_RPATH)
Expand Down
Loading