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

Don't duplicate -rpath for TBB #2952

Merged
merged 3 commits into from
Oct 4, 2023
Merged

Don't duplicate -rpath for TBB #2952

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d01e3e
Don't duplicate -rpath for TBB
WardBrian Sep 28, 2023
11ba18e
Merge branch 'develop' into fix/double-rpath
WardBrian Sep 29, 2023
c6e1396
Merge branch 'develop' into fix/double-rpath
WardBrian Oct 2, 2023
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
6 changes: 3 additions & 3 deletions make/compiler_flags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,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

Expand All @@ -291,7 +291,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

Expand Down