File tree 2 files changed +7
-2
lines changed
Filter options
2 files changed +7
-2
lines changed
Original file line number Diff line number Diff line change @@ -83,7 +83,8 @@ tbbLdFlags <- function() {
83
83
# shortcut if TBB_LIB defined
84
84
tbbLib <- Sys.getenv(" TBB_LINK_LIB" , Sys.getenv(" TBB_LIB" , unset = TBB_LIB ))
85
85
if (nzchar(tbbLib )) {
86
- fmt <- " -L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc"
86
+ fmt <- if (is_windows()) " -L%1$s -ltbb -ltbbmalloc"
87
+ else " -L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc"
87
88
return (sprintf(fmt , asBuildPath(tbbLib )))
88
89
}
89
90
Original file line number Diff line number Diff line change 13
13
14
14
# If TBB_LIB is defined, link to that explicitly.
15
15
ifdef TBB_LIB
16
- PKG_LIBS = -Wl,-L"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
16
+ ifeq ($(OS), Windows_NT)
17
+ PKG_LIBS = -Wl,-L"$(TBB_LIB)" -ltbb -ltbbmalloc
18
+ else
19
+ PKG_LIBS = -Wl,-L"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
20
+ endif
17
21
endif
18
22
19
23
ifeq ($(OS), Windows_NT)
You can’t perform that action at this time.
0 commit comments